Render refactor