Misc Rendering Cleanup