Refactoring continues