Simplifying and cleaning up design/code