diff --git a/aos/common/queue_types.cc b/aos/common/queue_types.cc
index e2310fc..d329cf1 100644
--- a/aos/common/queue_types.cc
+++ b/aos/common/queue_types.cc
@@ -124,9 +124,10 @@
     if (first) {
       first = false;
     } else {
-      if (*output_bytes < 1) return false;
-      *output_bytes -= 1;
+      if (*output_bytes < 2) return false;
+      *output_bytes -= 2;
       *(output++) = ',';
+      *(output++) = ' ';
     }
 
     if (*output_bytes < type.fields[i]->name.size() + 1) return false;
diff --git a/aos/common/queue_types_test.cc b/aos/common/queue_types_test.cc
index c665333..72eae94 100644
--- a/aos/common/queue_types_test.cc
+++ b/aos/common/queue_types_test.cc
@@ -132,12 +132,12 @@
 
 static const OtherTestingMessage kTestMessage1(true, 8971, 3.2);
 static const ::std::string kTestMessage1String =
-    ".aos.common.testing.OtherTestingMessage{test_bool:T,test_int:8971"
-    ",test_double:3.200000}";
+    ".aos.common.testing.OtherTestingMessage{test_bool:T, test_int:8971"
+    ", test_double:3.200000}";
 static const Structure kTestStructure1(false, 973, 8.56);
 static const ::std::string kTestStructure1String =
-    ".aos.common.testing.Structure{struct_bool:f,struct_int:973"
-    ",struct_float:8.560000}";
+    ".aos.common.testing.Structure{struct_bool:f, struct_int:973"
+    ", struct_float:8.560000}";
 
 TEST_F(PrintMessageTest, Basic) {
   assert(sizeof(input) >= kTestMessage1.Size());