Better design (22/36)

Better design