Better design (7/36)

Better design