completed Renderer refactoring