Better design (14/36)

Better design