diff --git a/ArduPlane/ArduPlane.pde b/ArduPlane/ArduPlane.pde
index eac02790cc..d25a8301be 100644
--- a/ArduPlane/ArduPlane.pde
+++ b/ArduPlane/ArduPlane.pde
@@ -298,9 +298,6 @@ AP_Relay relay;
 static bool usb_connected;
 #endif
 
-static const char *comma = ",";
-
-
 /* Radio values
  *               Channel assignments
  *                       1   Ailerons
diff --git a/ArduPlane/Log.pde b/ArduPlane/Log.pde
index 77e3b895e4..a0b7b53849 100644
--- a/ArduPlane/Log.pde
+++ b/ArduPlane/Log.pde
@@ -405,9 +405,9 @@ static void Log_Read_Control_Tuning()
         if(y < 8) logvar        = logvar/100.f;
         if(y == 9) logvar       = logvar/10000.f;
         Serial.print(logvar);
-        Serial.print(comma);
+        print_comma();
     }
-    Serial.println(" ");
+    Serial.println();
 }
 
 // Read a nav tuning packet
@@ -436,7 +436,7 @@ static void Log_Read_Performance()
     Serial.printf_P(PSTR("PM:"));
     pm_time = DataFlash.ReadLong();
     Serial.print(pm_time);
-    Serial.print(comma);
+    print_comma();
     for (int16_t y = 1; y <= 12; y++) {
         if(y < 3 || y > 7) {
             logvar = DataFlash.ReadInt();
@@ -444,9 +444,9 @@ static void Log_Read_Performance()
             logvar = DataFlash.ReadByte();
         }
         Serial.print(logvar);
-        Serial.print(comma);
+        print_comma();
     }
-    Serial.println(" ");
+    Serial.println();
 }
 
 // Read a command processing packet
@@ -459,14 +459,14 @@ static void Log_Read_Cmd()
     for(int16_t i = 1; i < 4; i++) {
         logvarb = DataFlash.ReadByte();
         Serial.print(logvarb, DEC);
-        Serial.print(comma);
+        print_comma();
     }
     for(int16_t i = 1; i < 4; i++) {
         logvarl = DataFlash.ReadLong();
         Serial.print(logvarl, DEC);
-        Serial.print(comma);
+        print_comma();
     }
-    Serial.println(" ");
+    Serial.println();
 }
 
 static void Log_Read_Startup()
@@ -533,9 +533,9 @@ static void Log_Read_Raw()
     for (int16_t y = 0; y < 6; y++) {
         logvar = (float)DataFlash.ReadLong() / t7;
         Serial.print(logvar);
-        Serial.print(comma);
+        print_comma();
     }
-    Serial.println(" ");
+    Serial.println();
 }
 
 // Read the DataFlash log memory : Packet Parser
diff --git a/ArduPlane/setup.pde b/ArduPlane/setup.pde
index 8a0243e3e3..9c3f8c7fdd 100644
--- a/ArduPlane/setup.pde
+++ b/ArduPlane/setup.pde
@@ -534,7 +534,7 @@ print_blanks(int16_t num)
 {
     while(num > 0) {
         num--;
-        Serial.println("");
+        Serial.println();
     }
 }
 
@@ -544,7 +544,7 @@ print_divider(void)
     for (int16_t i = 0; i < 40; i++) {
         Serial.printf_P(PSTR("-"));
     }
-    Serial.println("");
+    Serial.println();
 }
 
 static int8_t
diff --git a/ArduPlane/system.pde b/ArduPlane/system.pde
index f916c622ff..ec4a473338 100644
--- a/ArduPlane/system.pde
+++ b/ArduPlane/system.pde
@@ -602,3 +602,8 @@ print_flight_mode(uint8_t mode)
         break;
     }
 }
+
+static void print_comma(void)
+{
+    Serial.print_P(PSTR(","));
+}
diff --git a/ArduPlane/test.pde b/ArduPlane/test.pde
index 0c36018f39..102f4b0858 100644
--- a/ArduPlane/test.pde
+++ b/ArduPlane/test.pde
@@ -136,10 +136,10 @@ test_passthru(uint8_t argc, const Menu::arg *argv)
 
         // New radio frame? (we could use also if((millis()- timer) > 20)
         if (APM_RC.GetState() == 1) {
-            Serial.print("CH:");
+            Serial.print_P(PSTR("CH:"));
             for(int16_t i = 0; i < 8; i++) {
                 Serial.print(APM_RC.InputCh(i));        // Print channel values
-                Serial.print(",");
+                print_comma();
                 APM_RC.OutputCh(i, APM_RC.InputCh(i)); // Copy input to Servos
             }
             Serial.println();