Better design (25/36)

Better design