Rendering Refactoring