Better design (21/36)

Better design