 {
     //Check peer-to-peer connectivity
     std::cout << "P2P Connectivity Matrix\n";
-    std::cout << "     D\\D";
-    for (auto device : cuda::devices()) {
-        std::cout << std::setw(6) << device.id() << ' ';
+    std::cout << "   D\\D ";
+    for (auto device : cuda::devices()) {
+        std::cout << std::setw(bandwidth::field_width) << device.id() << ' ';
     }
     std::cout << "\n";
     for (auto device : cuda::devices()) {
-        std::cout << std::setw(6) << device.id() << '\t';
+        std::cout << std::setw(bandwidth::field_width) << device.id() << ' ';
         for (auto peer : cuda::devices()) {
             if (device != peer) {
                 auto access = cuda::device::peer_to_peer::can_access(device, peer);
-                std::cout << std::setw(1) << ((access) ? 1 : 0);
+                std::cout << std::setw(bandwidth::field_width) << ((access) ? 1 : 0);
             } else {
-                std::cout << std::setw(1) << 1;
-            }
+                std::cout << std::setw(bandwidth::field_width) << 1;
+            }
+            std::cout << ' ';
         }
         std::cout << "\n";
     }

        for (auto peer : cuda::devices()) {
            if ((cuda::device_t)device != (cuda::device_t)peer) {
                auto access = cuda::device::peer_to_peer::can_access(device, peer);
                std::cout << "Device=" << device.id() << (access ? "CAN" : "CANNOT") << " access Peer Device " << peer.id() << "\n";
            }
        }
    }


    std::cout
        << "P2P=" << (test_p2p ? "Enabled": "Disabled") << " Latency "
        << (test_p2p ? (p2p_method == P2P_READ ? "(P2P Reads) " : "(P2P Writes) ") : "")
        << "Matrix (us)\n";

    std::cout << "   GPU ";

    for (auto device : cuda::devices()) {
        std::cout << std::setw(bandwidth::field_width) << device.id() << ' ';
    }

    std::cout << "\n";

    for (auto device : cuda::devices()) {
        std::cout << std::setw(bandwidth::field_width) << device.id() << ' ';

        for (auto peer : cuda::devices()) {
            std::cout << std::setprecision(bandwidth::precision) << std::setw(bandwidth::field_width) << gpuLatencyMatrix[device.id() * numGPUs + peer.id()] << ' ';
        }

        std::cout << "\n";
    }

    std::cout << "\n   CPU ";

    for (auto device : cuda::devices()) {
        std::cout << std::setw(bandwidth::field_width) << device.id() << ' ';
    }

    std::cout << "\n";

    for (auto device : cuda::devices()) {
        std::cout << std::setw(bandwidth::field_width) << device.id() << ' ';

        for (auto peer : cuda::devices()) {
            std::cout << std::setprecision(bandwidth::precision) << std::setw(bandwidth::field_width) << cpuLatencyMatrix[device.id() * numGPUs + peer.id()] << ' ';
        }

        std::cout << "\n";
