Refactoring started.