Code cleanup in Shader Init stuff