Moved rendering to Renderer class