Several simple refactorings