Other refactorings