Better design (16/36)

Better design