diff --git a/Geo/MHexahedron.h b/Geo/MHexahedron.h
index fa43326557c7c09abbba62b9b990b4e6d85e3839..fe7e3016f37f41cc1424c44741fc7676c5c3df70 100644
--- a/Geo/MHexahedron.h
+++ b/Geo/MHexahedron.h
@@ -520,19 +520,17 @@ class MHexahedronN : public MHexahedron {
 
     int n = _order-1;
     for (int i = 0; i < 4; i++) {
-      if(faces2edge_hexa(num, i) > 0)
-      {
+      if(faces2edge_hexa(num, i) > 0){
         int edge_num = faces2edge_hexa(num, i) - 1;
         for (int j = 0; j < n; j++) v[++count] = _vs[n*edge_num + j];
       }
-      else
-      {
+      else{
         int edge_num = -faces2edge_hexa(num, i) - 1;
         for (int j = n-1; j >= 0; j--) v[++count] = _vs[n*edge_num + j];
       }
     }
 
-    if (v.size() > count + 1) {
+    if ((int)v.size() > count + 1) {
       int start = 12 * n + num * n*n;
       for (int i = 0; i < n*n; i++){
         v[++count] = _vs[start + i];
diff --git a/Geo/MTetrahedron.h b/Geo/MTetrahedron.h
index 091df43fb6fbe3072fe5c2729fc6a9d07de66deb..e8f32c5590d9a0ea74fd48b8be9c0a8361afffde 100644
--- a/Geo/MTetrahedron.h
+++ b/Geo/MTetrahedron.h
@@ -359,21 +359,19 @@ class MTetrahedronN : public MTetrahedron {
     MTetrahedron::_getFaceVertices(num, v);
     int count = 2;
 
-    int n = _order-1;
+    int n = _order - 1;
     for (int i = 0; i < 3; i++) {
-      if(faces2edge_tetra(num, i) > 0)
-      {
+      if(faces2edge_tetra(num, i) > 0){
         int edge_num = faces2edge_tetra(num, i) - 1;
         for (int j = 0; j < n; j++) v[++count] = _vs[n*edge_num + j];
       }
-      else
-      {
+      else{
         int edge_num = -faces2edge_tetra(num, i) - 1;
         for (int j = n-1; j >= 0; j--) v[++count] = _vs[n*edge_num + j];
       }
     }
 
-    if (v.size() > count + 1) {
+    if ((int)v.size() > count + 1) {
       int start = 6 * n + num * (n-1)*n/2;
       for (int i = 0; i < (n-1)*n/2; i++){
         v[++count] = _vs[start + i];
@@ -385,7 +383,7 @@ class MTetrahedronN : public MTetrahedron {
     if (ElementType::SerendipityFromTag(getTypeForMSH()) > 0)
       return 0;
     else
-      return  ((_order - 1) * (_order - 2) * (_order - 3)) / 6;
+      return ((_order - 1) * (_order - 2) * (_order - 3)) / 6;
   }
   virtual int getTypeForMSH() const
   {