Better design (18/36)

Better design