Refactoring started!