More refactoring (less)