Refactoring started