(Cg) Clean this up a little.