Better design (27/36)

Better design