Better design (5/36)

Better design