Refactored Renderer quite a bit