diff --git a/Geo/MHexahedron.h b/Geo/MHexahedron.h
index b1ff3dcec94b6f77cb2da0d5ceb0494febf95438..a60ae836a5bfd53d0688d08419f47a93f4bdc8eb 100644
--- a/Geo/MHexahedron.h
+++ b/Geo/MHexahedron.h
@@ -146,7 +146,7 @@ class MHexahedron : public MElement {
     return true;
   }
   virtual void getIntegrationPoints(int pOrder, int *npts, IntPt **pts);
-  static int edges_hexa(const int edge, const int vert) 
+  static int edges_hexa(const int edge, const int vert)
   {
     static const int e[12][2] = {
       {0, 1},
@@ -164,7 +164,7 @@ class MHexahedron : public MElement {
     };
     return e[edge][vert];
   }
-  static int faces_hexa(const int face, const int vert) 
+  static int faces_hexa(const int face, const int vert)
   {
     static const int f[6][4] = {
       {0, 3, 2, 1},
@@ -483,14 +483,14 @@ class MHexahedron27 : public MHexahedron {
  *    N = 0RDER - 1
  *    8 := 8 --> 8 + N
  *    9 := 8 + N + 1 --> 8 +  2 * N
- *    : 
+ *    :
  *   19 := 8 + 11 * N + 1 --> 8 +  12 * N
  *   20 := 8 + 12 * N + 1 --> 8 +  12 * N + N^2
  *   21 := 8 + 12 * N + N^2 --> 8 +  12 * N + 2 * N^2
- *    : 
+ *    :
  *   25 := 8 + 12 * N + 5 * N^2 + 1 --> 8 +  12 * N + 6 * N^2
  *   26 := 8 + 12 * N + 6 * N^2 + 1 --> 8 +  12 * N + 6 * N^2 + N^3
- * 
+ *
  */
 
 
@@ -518,18 +518,18 @@ class MHexahedronN : public MHexahedron {
   virtual MVertex *getVertex(int num){ return num < 8 ? _v[num] : _vs[num - 8]; }
   virtual int getNumEdgeVertices() const { return 12 * (_order - 1); }
   virtual int getNumFaceVertices() const { return 6 * (_order - 1)*(_order - 1); }
-  virtual int getNumVolumeVertices() const 
-  { 
+  virtual int getNumVolumeVertices() const
+  {
     switch(getTypeForMSH()){
-    case MSH_HEX_27 : 
-    case MSH_HEX_64 : 
-    case MSH_HEX_125 : 
-    case MSH_HEX_216 : 
-    case MSH_HEX_343 : 
-    case MSH_HEX_512 : 
-    case MSH_HEX_729 : 
-    case MSH_HEX_1000 : 
-      return (_order - 1) * (_order - 1) * (_order - 1); 
+    case MSH_HEX_27 :
+    case MSH_HEX_64 :
+    case MSH_HEX_125 :
+    case MSH_HEX_216 :
+    case MSH_HEX_343 :
+    case MSH_HEX_512 :
+    case MSH_HEX_729 :
+    case MSH_HEX_1000 :
+      return (_order - 1) * (_order - 1) * (_order - 1);
     default:
       return 0;
     }
@@ -556,7 +556,7 @@ class MHexahedronN : public MHexahedron {
     };
     int count = 4;
     for (int i = 0; i < 4; i++){
-      for (int j = 0; j < _order - 1; j++) v[count++] = _vs[(_order-1)*f[num][i]+j];      
+      for (int j = 0; j < _order - 1; j++) v[count++] = _vs[(_order-1)*f[num][i]+j];
     }
     for (int i = 0; i < (_order + 1) * (_order + 1); i++){
       int N = _order - 1;
diff --git a/Geo/MPrism.h b/Geo/MPrism.h
index c43c6bf7a79f8a3884fad29604f3b21721fc6656..3a09de8d74244bbb54e0ed3a3e7fff60539c29b8 100644
--- a/Geo/MPrism.h
+++ b/Geo/MPrism.h
@@ -150,8 +150,7 @@ class MPrism : public MElement {
     return true;
   }
   virtual void getIntegrationPoints(int pOrder, int *npts, IntPt **pts);
- private:
-  int edges_prism(const int edge, const int vert) const
+  static int edges_prism(const int edge, const int vert)
   {
     static const int e[9][2] = {
       {0, 1},
@@ -166,7 +165,7 @@ class MPrism : public MElement {
     };
     return e[edge][vert];
   }
-  int faces_prism(const int face, const int vert) const
+  static int faces_prism(const int face, const int vert)
   {
     static const int f[5][4] = {
       {0, 2, 1, -1},
diff --git a/Geo/MPyramid.h b/Geo/MPyramid.h
index 47aaffa794623649579e9b819b2b2b23d1c2f2f2..90676b6f21986a2ca5961f45865e55e2108373d7 100644
--- a/Geo/MPyramid.h
+++ b/Geo/MPyramid.h
@@ -184,8 +184,7 @@ class MPyramid : public MElement {
       return false;
     return true;
   }
- private:
-  int edges_pyramid(const int edge, const int vert) const
+  static int edges_pyramid(const int edge, const int vert)
   {
     static const int e[8][2] = {
       {0, 1},
@@ -199,7 +198,7 @@ class MPyramid : public MElement {
     };
     return e[edge][vert];
   }
-  int faces_pyramid(const int face, const int vert) const
+  static int faces_pyramid(const int face, const int vert)
   {
     // only triangular faces
     static const int f[4][3] = {
diff --git a/Geo/MQuadrangle.h b/Geo/MQuadrangle.h
index d96123e369b267c89b357542e1f6d65c56520cf9..a0c934faf3db9695d2a8263f25420fa36d43a1f4 100644
--- a/Geo/MQuadrangle.h
+++ b/Geo/MQuadrangle.h
@@ -148,8 +148,7 @@ void projectInMeanPlane(double *xn, double *yn);
   // criterion.
   virtual double getInnerRadius();
   virtual double getOuterRadius();
- private:
-  int edges_quad(const int edge, const int vert) const
+  static int edges_quad(const int edge, const int vert)
   {
     static const int e[4][2] = {
       {0, 1},
diff --git a/Geo/MTetrahedron.h b/Geo/MTetrahedron.h
index 665db9a877b0fb99b1c2e9e33d1deb522604fc88..aca7ef3daa1a6d9b1e84123af4d81f0fe4be1537 100644
--- a/Geo/MTetrahedron.h
+++ b/Geo/MTetrahedron.h
@@ -149,8 +149,7 @@ class MTetrahedron : public MElement {
   }
   virtual void getIntegrationPoints(int pOrder, int *npts, IntPt **pts);
   virtual SPoint3 circumcenter();
- private:
-  int edges_tetra(const int edge, const int vert) const
+  static int edges_tetra(const int edge, const int vert)
   {
     static const int e[6][2] = {
       {0, 1},
@@ -162,7 +161,7 @@ class MTetrahedron : public MElement {
     };
     return e[edge][vert];
   }
-  int faces_tetra(const int face, const int vert) const
+  static int faces_tetra(const int face, const int vert)
   {
     static const int f[4][3] = {
       {0, 2, 1},
diff --git a/Geo/MTriangle.h b/Geo/MTriangle.h
index f3063303345b1695012bd92911103ac562a540ff..17d2bb59713f74042ce15dafe630f92a24f8f079 100644
--- a/Geo/MTriangle.h
+++ b/Geo/MTriangle.h
@@ -144,8 +144,7 @@ class MTriangle : public MElement {
   }
   virtual void getIntegrationPoints(int pOrder, int *npts, IntPt **pts);
   virtual SPoint3 circumcenter();
- private:
-  int edges_tri(const int edge, const int vert) const
+  static int edges_tri(const int edge, const int vert)
   {
     static const int e[3][2] = {
       {0, 1},