Clean up renderer a little
More Renderer refactoring