Refactor UniformBlock