Shader code cleanup