Refactoring started
Refactoring continues