Better design (23/36)

Better design