-refactoring going well