The refactoring has been started