Refactoring begins.