Better design (15/36)

Better design