Some clean-up in the shaders