diff --git a/src/main/java/org/apache/commons/csv/CSVFormat.java b/src/main/java/org/apache/commons/csv/CSVFormat.java
index ac3c0a43..d96b6832 100644
--- a/src/main/java/org/apache/commons/csv/CSVFormat.java
+++ b/src/main/java/org/apache/commons/csv/CSVFormat.java
@@ -419,17 +419,23 @@ public class CSVFormat implements Serializable {
         StringBuilder sb = new StringBuilder();
         sb.append("Delimiter=<").append(delimiter).append('>');
         if (isEscaping()) {
-            sb.append(',');
+            sb.append(' ');
             sb.append("Escape=<").append(escape).append('>');
         }
         if (isEncapsulating()) {
-            sb.append(',');
+            sb.append(' ');
             sb.append("Encapsulator=<").append(encapsulator).append('>');            
         }
         if (isCommentingEnabled()) {
-            sb.append(',');
+            sb.append(' ');
             sb.append("CommentStart=<").append(commentStart).append('>');
         }
+        if (isEmptyLinesIgnored()) {
+            sb.append(" EmptyLines:ignored");            
+        }
+        if (isSurroundingSpacesIgnored()) {
+            sb.append(" SurroundingSpaces:ignored");            
+        }
         return sb.toString();
     }