Cleaned up Rendering