slight cleanup and groupgraph