Cleaning up the design.