Start global refactoring