Refactor started.