Refactor uniforms
Refactor uniforms
Refactor uniforms