jon@purity:~/projects/bitcoin/bitcoin (netinfo-fixups)$ git diff 43ee49f bab058e
diff --git a/doc/release-notes.md b/doc/release-notes.md
index ccd66f9e85..65726f3d5d 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -207,11 +207,6 @@ Tools and Utilities
 
-- A new `bitcoin-cli -netinfo` command returns a network peer connections
-  dashboard that displays data from the `getpeerinfo` and `getnetworkinfo` RPCs
-  in a human-readable format. An optional integer argument from `0` to `4` may
-  be passed to see various levels of detail. (#19643)
-
index 14ac13632e..2054e991d5 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -14,11 +14,13 @@
 #include <rpc/request.h>
+#include <tinyformat.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 #include <util/translation.h>
 #include <util/url.h>
 
+#include <algorithm>
 #include <functional>
 #include <memory>
 #include <stdio.h>
@@ -316,19 +317,19 @@ private:
     struct Peer {
-        int id;
-        int mapped_as;
-        int version;
+        std::string addr;
+        std::string sub_version;
+        std::string network;
+        std::string age;
+        double min_ping;
+        double ping;
         int64_t last_blck;
         int64_t last_recv;
         int64_t last_send;
         int64_t last_trxn;
-        double min_ping;
-        double ping;
-        std::string addr;
-        std::string age;
-        std::string network;
-        std::string sub_version;
+        int id;
+        int mapped_as;
+        int version;
         bool is_block_relay;
         bool is_outbound;
@@ -345,7 +346,7 @@ private:
         const double milliseconds{round(1000 * seconds)};
-        return milliseconds <= 999999 ? ToString(milliseconds) : "-";
+        return milliseconds > 999999 ? "-" : ToString(milliseconds);
     }
 
@@ -408,10 +409,10 @@ public:
                 const std::string sub_version{peer["subver"].get_str()};
-                m_peers.push_back({peer_id, mapped_as, version, last_blck, last_recv, last_send, last_trxn, min_ping, ping, addr, age, network, sub_version, is_block_relay, is_outbound});
-                m_max_id_length = std::max(ToString(peer_id).length(), m_max_id_length);
+                m_peers.push_back({addr, sub_version, network, age, min_ping, ping, last_blck, last_recv, last_send, last_trxn, peer_id, mapped_as, version, is_block_relay, is_outbound});
                 m_max_addr_length = std::max(addr.length() + 1, m_max_addr_length);
-                m_max_age_length = std::max(ToString(age).length(), m_max_age_length);
+                m_max_age_length = std::max(age.length(), m_max_age_length);
+                m_max_id_length = std::max(ToString(peer_id).length(), m_max_id_length);
                 m_is_asmap_on |= (mapped_as != 0);
@@ -464,11 +466,12 @@ public:
         if (local_addrs.empty()) {
             result += ": n/a\n";
         } else {
+            size_t max_addr_size{0};
             for (const UniValue& addr : local_addrs) {
-                m_max_addr_length = std::max(addr["address"].get_str().length() + 1, m_max_addr_length);
+                max_addr_size = std::max(addr["address"].get_str().length() + 1, max_addr_size);
             }
             for (const UniValue& addr : local_addrs) {
-                result += strprintf("\n%-*s    port %6i    score %6i", m_max_addr_length, addr["address"].get_str(), addr["port"].get_int(), addr["score"].get_int());
+                result += strprintf("\n%-*s    port %6i    score %6i", max_addr_size, addr["address"].get_str(), addr["port"].get_int(), addr["score"].get_int());
             }
         }