Better design (34/36)

Better design