refactoring started