Bunch of cleanup, specifically instantiation of uniforms