Refactoring started...