More graph work
Minor refactoring in GraphUtils
Rename function
Tidy up helper functions