Shader cleanup

This cleans up the shader and the shader loading code.