diff --git a/src/Mod/Image/Gui/ViewProviderImagePlane.cpp b/src/Mod/Image/Gui/ViewProviderImagePlane.cpp
index 1ecbb16c35..eac136d5fd 100644
--- a/src/Mod/Image/Gui/ViewProviderImagePlane.cpp
+++ b/src/Mod/Image/Gui/ViewProviderImagePlane.cpp
@@ -23,7 +23,7 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
- #include <sstream>
+# include <sstream>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoFaceSet.h>
 # include <Inventor/nodes/SoMaterial.h>
diff --git a/src/Mod/Mesh/App/Core/Builder.cpp b/src/Mod/Mesh/App/Core/Builder.cpp
index 3dddec8687..7400299541 100644
--- a/src/Mod/Mesh/App/Core/Builder.cpp
+++ b/src/Mod/Mesh/App/Core/Builder.cpp
@@ -275,11 +275,14 @@ struct MeshFastBuilder::Private {
         }
         bool operator<(const Vertex& rhs) const
         {
-            if      (x != rhs.x)
+            if (x != rhs.x)
                 return x < rhs.x;
-            else if (y != rhs.y)    return y < rhs.y;
-            else if (z != rhs.z)    return z < rhs.z;
-            else                    return false;
+            else if (y != rhs.y)
+                return y < rhs.y;
+            else if (z != rhs.z)
+                return z < rhs.z;
+            else
+                return false;
         }
     };
 
diff --git a/src/Mod/Mesh/App/Core/Degeneration.cpp b/src/Mod/Mesh/App/Core/Degeneration.cpp
index fd64e8a858..9af888ef4c 100644
--- a/src/Mod/Mesh/App/Core/Degeneration.cpp
+++ b/src/Mod/Mesh/App/Core/Degeneration.cpp
@@ -301,13 +301,18 @@ struct MeshFacet_Less
         if (y1 > y2)
         { tmp = y1; y1 = y2; y2 = tmp; }
 
-        if      (x0 < y0)
+        if (x0 < y0)
             return true;
-        else if (x0 > y0)  return false;
-        else if (x1 < y1)  return true;
-        else if (x1 > y1)  return false;
-        else if (x2 < y2)  return true;
-        else               return false;
+        else if (x0 > y0)
+            return false;
+        else if (x1 < y1)
+            return true;
+        else if (x1 > y1)
+            return false;
+        else if (x2 < y2)
+            return true;
+        else
+            return false;
     }
 };
 
@@ -1104,12 +1109,8 @@ bool MeshFixRangePoint::Fixup()
         // 'DeleteFacets' will segfault. But setting all point indices to 0 works.
         std::vector<PointIndex> invalid = eval.GetIndices();
         if (!invalid.empty()) {
-            const MeshFacetArray& rFaces = _rclMesh.GetFacets();
             for (std::vector<PointIndex>::iterator it = invalid.begin(); it != invalid.end(); ++it) {
-                MeshFacet& face = const_cast<MeshFacet&>(rFaces[*it]);
-                face._aulPoints[0] = 0;
-                face._aulPoints[1] = 0;
-                face._aulPoints[2] = 0;
+                _rclMesh.SetFacetPoints(*it, 0, 0, 0);
             }
 
             _rclMesh.DeleteFacets(invalid);
diff --git a/src/Mod/Mesh/App/Core/Triangulation.cpp b/src/Mod/Mesh/App/Core/Triangulation.cpp
index bb4fc1510a..504c6726a2 100644
--- a/src/Mod/Mesh/App/Core/Triangulation.cpp
+++ b/src/Mod/Mesh/App/Core/Triangulation.cpp
@@ -606,10 +606,16 @@ struct Vertex2d_Less
     bool operator()(const Base::Vector3f& p, const Base::Vector3f& q) const
     {
         if (fabs(p.x - q.x) < MeshDefinitions::_fMinPointDistanceD1) {
-        if (fabs(p.y - q.y) < MeshDefinitions::_fMinPointDistanceD1) {
-        return false;
-    } else return p.y < q.y;
-        } else return p.x < q.x;
+            if (fabs(p.y - q.y) < MeshDefinitions::_fMinPointDistanceD1) {
+                return false;
+            }
+            else {
+                return p.y < q.y;
+            }
+        }
+        else {
+            return p.x < q.x;
+        }
     }
 };
 struct Vertex2d_EqualTo