Rendering refactoring