Internal refactorings