More refactorings...