refactoring is going well