diff --git a/gtsam/discrete/tests/testDiscreteFactorGraph.cpp b/gtsam/discrete/tests/testDiscreteFactorGraph.cpp
index 6e8621595..08b5f2db9 100644
--- a/gtsam/discrete/tests/testDiscreteFactorGraph.cpp
+++ b/gtsam/discrete/tests/testDiscreteFactorGraph.cpp
@@ -356,37 +356,37 @@ size: 2
 factor 0:  f[ (m0,2), (m1,2), (m2,2), ]
  Choice(m2) 
  0 Choice(m1) 
- 0 0 Leaf [2]   0
+ 0 0 Leaf [2]    0
  0 1 Choice(m0) 
- 0 1 0 Leaf [1]0.27527634
- 0 1 1 Leaf [1]   0
+ 0 1 0 Leaf [1] 0.27527634
+ 0 1 1 Leaf [1]    0
  1 Choice(m1) 
- 1 0 Leaf [2]   0
+ 1 0 Leaf [2]    0
  1 1 Choice(m0) 
- 1 1 0 Leaf [1]0.44944733
- 1 1 1 Leaf [1]0.27527634
+ 1 1 0 Leaf [1] 0.44944733
+ 1 1 1 Leaf [1] 0.27527634
 factor 1:  f[ (m0,2), (m1,2), (m2,2), (m3,2), ]
  Choice(m3) 
  0 Choice(m2) 
  0 0 Choice(m1) 
- 0 0 0 Leaf [2]   1
- 0 0 1 Leaf [2]0.015366387
+ 0 0 0 Leaf [2]    1
+ 0 0 1 Leaf [2] 0.015366387
  0 1 Choice(m1) 
- 0 1 0 Leaf [2]   1
+ 0 1 0 Leaf [2]    1
  0 1 1 Choice(m0) 
- 0 1 1 0 Leaf [1]   1
- 0 1 1 1 Leaf [1]0.015365663
+ 0 1 1 0 Leaf [1]    1
+ 0 1 1 1 Leaf [1] 0.015365663
  1 Choice(m2) 
  1 0 Choice(m1) 
- 1 0 0 Leaf [2]   1
+ 1 0 0 Leaf [2]    1
  1 0 1 Choice(m0) 
- 1 0 1 0 Leaf [1]0.0094115739
- 1 0 1 1 Leaf [1]0.0094115652
+ 1 0 1 0 Leaf [1] 0.0094115739
+ 1 0 1 1 Leaf [1] 0.0094115652
  1 1 Choice(m1) 
- 1 1 0 Leaf [2]   1
+ 1 1 0 Leaf [2]    1
  1 1 1 Choice(m0) 
- 1 1 1 0 Leaf [1]   1
- 1 1 1 1 Leaf [1]0.009321081
+ 1 1 1 0 Leaf [1]    1
+ 1 1 1 1 Leaf [1] 0.009321081
 )";
 #else
   string expected_dfg = R"(
@@ -395,50 +395,50 @@ factor 0:  f[ (m0,2), (m1,2), (m2,2), ]
  Choice(m2) 
  0 Choice(m1) 
  0 0 Choice(m0) 
- 0 0 0 Leaf [1]   0
- 0 0 1 Leaf [1]   0
+ 0 0 0 Leaf [1]    0
+ 0 0 1 Leaf [1]    0
  0 1 Choice(m0) 
- 0 1 0 Leaf [1]0.27527634
- 0 1 1 Leaf [1]0.44944733
+ 0 1 0 Leaf [1] 0.27527634
+ 0 1 1 Leaf [1] 0.44944733
  1 Choice(m1) 
  1 0 Choice(m0) 
- 1 0 0 Leaf [1]   0
- 1 0 1 Leaf [1]   0
+ 1 0 0 Leaf [1]    0
+ 1 0 1 Leaf [1]    0
  1 1 Choice(m0) 
- 1 1 0 Leaf [1]   0
- 1 1 1 Leaf [1]0.27527634
+ 1 1 0 Leaf [1]    0
+ 1 1 1 Leaf [1] 0.27527634
 factor 1:  f[ (m0,2), (m1,2), (m2,2), (m3,2), ]
  Choice(m3) 
  0 Choice(m2) 
  0 0 Choice(m1) 
  0 0 0 Choice(m0) 
- 0 0 0 0 Leaf [1]   1
- 0 0 0 1 Leaf [1]   1
+ 0 0 0 0 Leaf [1]    1
+ 0 0 0 1 Leaf [1]    1
  0 0 1 Choice(m0) 
- 0 0 1 0 Leaf [1]0.015366387
- 0 0 1 1 Leaf [1]0.015366387
+ 0 0 1 0 Leaf [1] 0.015366387
+ 0 0 1 1 Leaf [1] 0.015366387
  0 1 Choice(m1) 
  0 1 0 Choice(m0) 
- 0 1 0 0 Leaf [1]   1
- 0 1 0 1 Leaf [1]   1
+ 0 1 0 0 Leaf [1]    1
+ 0 1 0 1 Leaf [1]    1
  0 1 1 Choice(m0) 
- 0 1 1 0 Leaf [1]   1
- 0 1 1 1 Leaf [1]0.015365663
+ 0 1 1 0 Leaf [1]    1
+ 0 1 1 1 Leaf [1] 0.015365663
  1 Choice(m2) 
  1 0 Choice(m1) 
  1 0 0 Choice(m0) 
- 1 0 0 0 Leaf [1]   1
- 1 0 0 1 Leaf [1]   1
+ 1 0 0 0 Leaf [1]    1
+ 1 0 0 1 Leaf [1]    1
  1 0 1 Choice(m0) 
- 1 0 1 0 Leaf [1]0.0094115739
- 1 0 1 1 Leaf [1]0.0094115652
+ 1 0 1 0 Leaf [1] 0.0094115739
+ 1 0 1 1 Leaf [1] 0.0094115652
  1 1 Choice(m1) 
  1 1 0 Choice(m0) 
- 1 1 0 0 Leaf [1]   1
- 1 1 0 1 Leaf [1]   1
+ 1 1 0 0 Leaf [1]    1
+ 1 1 0 1 Leaf [1]    1
  1 1 1 Choice(m0) 
- 1 1 1 0 Leaf [1]   1
- 1 1 1 1 Leaf [1]0.009321081
+ 1 1 1 0 Leaf [1]    1
+ 1 1 1 1 Leaf [1] 0.009321081
 )";
 #endif
 
diff --git a/gtsam/hybrid/MixtureFactor.h b/gtsam/hybrid/MixtureFactor.h
index 529c8687b..df8e0193a 100644
--- a/gtsam/hybrid/MixtureFactor.h
+++ b/gtsam/hybrid/MixtureFactor.h
@@ -191,7 +191,7 @@ class MixtureFactor : public HybridFactor {
     std::cout << "\nMixtureFactor\n";
     auto valueFormatter = [](const sharedFactor& v) {
       if (v) {
-        return " Nonlinear factor on " + std::to_string(v->size()) + " keys";
+        return "Nonlinear factor on " + std::to_string(v->size()) + " keys";
       } else {
         return std::string("nullptr");
       }