Refactoring code and moving about things