A few refactorings for presentation