refactoring under way