Rendering clean up

could do more