Start moving towards more variable use and refactoring