Some simple refactorings