Multiple refactorings