simplify rtgeom names, clean up comments