Refactored attributes and uniforms