Simple refactorings