refactoring a refactor