refactoring not completed