Improve graphviz graph