Rework design to be cleaner