Starting refactoring.