More refactoring, done