Better design (9/36)

Better design