Some formatting cleanup
More improvements to graph updating