Better design (4/36)

Better design