diff --git a/tool/CommandMaster.cpp b/tool/CommandMaster.cpp
index 390ca9925f5ccc70041273e45277db2c6e1cfecc..221cb9bf4106de389becea637f62f2b0a1434bc6 100644
--- a/tool/CommandMaster.cpp
+++ b/tool/CommandMaster.cpp
@@ -149,8 +149,8 @@ void CommandMaster::execute(const StringVector &args)
                     << "      Tx frame rate [1/s]: "
                     << setfill(' ') << setprecision(0) << fixed;
                 for (j = 0; j < EC_RATE_COUNT; j++) {
-                    cout <<
-                        setw(5) << data.devices[i].tx_frame_rates[j] / 1000.0;
+                    cout << setw(ColWidth)
+                        << data.devices[i].tx_frame_rates[j] / 1000.0;
                     if (j < EC_RATE_COUNT - 1) {
                         cout << " ";
                     }
@@ -159,7 +159,7 @@ void CommandMaster::execute(const StringVector &args)
                     << "      Tx rate [KByte/s]:   "
                     << setprecision(1) << fixed;
                 for (j = 0; j < EC_RATE_COUNT; j++) {
-                    cout << setw(5)
+                    cout << setw(ColWidth)
                         << data.devices[i].tx_byte_rates[j] / 1024.0;
                     if (j < EC_RATE_COUNT - 1) {
                         cout << " ";
@@ -169,7 +169,8 @@ void CommandMaster::execute(const StringVector &args)
                     << "      Loss rate [1/s]:     "
                     << setprecision(0) << fixed;
                 for (j = 0; j < EC_RATE_COUNT; j++) {
-                    cout << setw(5) << data.devices[i].loss_rates[j] / 1000.0;
+                    cout << setw(ColWidth)
+                        << data.devices[i].loss_rates[j] / 1000.0;
                     if (j < EC_RATE_COUNT - 1) {
                         cout << " ";
                     }
@@ -183,7 +184,7 @@ void CommandMaster::execute(const StringVector &args)
                         perc = 100.0 * data.devices[i].loss_rates[j] /
                             data.devices[i].tx_frame_rates[j];
                     }
-                    cout << setw(5) << perc;
+                    cout << setw(ColWidth) << perc;
                     if (j < EC_RATE_COUNT - 1) {
                         cout << " ";
                     }
diff --git a/tool/CommandMaster.h b/tool/CommandMaster.h
index 45add9477a42ee657b8c1ca3808aae85ed90e3f2..de7976d4909e21273a890ad163b2da5cad6156df 100644
--- a/tool/CommandMaster.h
+++ b/tool/CommandMaster.h
@@ -42,6 +42,9 @@ class CommandMaster:
 
         string helpString() const;
         void execute(const StringVector &);
+
+    private:
+        enum {ColWidth = 6};
 };
 
 /****************************************************************************/