Refactoring begins