Refactoring begun