Starting refactoring...