Small refactor of RenderController