More refactoring: