Minor clean ups

Starting some of the minor clean ups for body/graph.c