more Renderer refactoring