More refactoring in progress