More refactoring!