More refactoring up and going