Simplified subgraph-print a bit

Starting to consolidate calls to (format)