Shader refactor, remove optional param in constructor