Simplifying and cleaning up