Better design (20/36)

Better design