Removed extraneous code, fixed shading