Better design (26/36)

Better design