Clean up Renderer a bit