Cosmetic refactorings