slight tidy up of code and dot file to reflect new call graph