Render refactoring