Add uses to CG_Class, adjust formatting