Better design (2/36)

Better design