Graphing tidy up