Small rendering refactorings