- Refactoring Renderer