Renderer refactor