Cleaned up shaders