More refactoring ...