Simplify uniforms