CanvasRenderer: Clean up code