Better design (1/36)

Better design