More refactoring in place