Better design (3/36)

Better design