Start refactoring
Continuing refactoring
Ends refactoring