minor cleanup to shaders