diff --git a/libsrc/meshing/curvedelems.cpp b/libsrc/meshing/curvedelems.cpp
index 53c8dc43..a5d7c37b 100644
--- a/libsrc/meshing/curvedelems.cpp
+++ b/libsrc/meshing/curvedelems.cpp
@@ -1298,8 +1298,7 @@ namespace netgen
                       SurfaceElementIndex sei = top.GetFace2SurfaceElement (f+1)-1;
                       PointGeomInfo gi = mesh[sei].GeomInfoPi(1);
 
-		      ref -> ProjectToSurface (pp, surfnr[facenr], gi);
-
+                      ref -> ProjectToSurface (pp, surfnr[facenr], gi);
 		      Vec<3> dist = pp-xa[jj];
 		
 		      CalcTrigShape (order1, lami[fnums[1]]-lami[fnums[0]],
diff --git a/libsrc/meshing/meshfunc2d.cpp b/libsrc/meshing/meshfunc2d.cpp
index de6d8d70..765bbf6a 100644
--- a/libsrc/meshing/meshfunc2d.cpp
+++ b/libsrc/meshing/meshfunc2d.cpp
@@ -6,8 +6,7 @@ namespace netgen
 
   DLL_HEADER void Optimize2d (Mesh & mesh, MeshingParameters & mp)
   {
-    static int timer = NgProfiler::CreateTimer ("optimize2d");
-    NgProfiler::RegionTimer reg(timer);
+    static Timer timer("optimize2d"); RegionTimer reg(timer);
 
     mesh.CalcSurfacesOfNode();
 
diff --git a/libsrc/meshing/meshing2.cpp b/libsrc/meshing/meshing2.cpp
index 2a9ebf08..d51c358a 100644
--- a/libsrc/meshing/meshing2.cpp
+++ b/libsrc/meshing/meshing2.cpp
@@ -195,7 +195,7 @@ namespace netgen
 
   MESHING2_RESULT Meshing2 :: GenerateMesh (Mesh & mesh, const MeshingParameters & mp, double gh, int facenr)
   {
-    static int timer = NgProfiler::CreateTimer ("surface meshing");
+    static Timer timer("surface meshing"); RegionTimer reg(timer);
 
     static int timer1 = NgProfiler::CreateTimer ("surface meshing1");
     static int timer2 = NgProfiler::CreateTimer ("surface meshing2");
@@ -206,8 +206,6 @@ namespace netgen
     static int ts3 = NgProfiler::CreateTimer ("surface meshing start 3");
 
 
-    NgProfiler::RegionTimer reg (timer);
-
     NgProfiler::StartTimer (ts1);
 
     Array<int> pindex, lindex;
diff --git a/libsrc/meshing/smoothing2.cpp b/libsrc/meshing/smoothing2.cpp
index 537ed391..419cc640 100644
--- a/libsrc/meshing/smoothing2.cpp
+++ b/libsrc/meshing/smoothing2.cpp
@@ -729,11 +729,11 @@ namespace netgen
 	return;
       }
 
-    static int timer = NgProfiler::CreateTimer ("MeshSmoothing 2D");
+    static Timer timer("MeshSmoothing 2D");
     static int timer1 = NgProfiler::CreateTimer ("MeshSmoothing 2D start");
     static int timer2 = NgProfiler::CreateTimer ("MeshSmoothing 2D - BFGS");
 
-    NgProfiler::RegionTimer reg (timer);
+    RegionTimer reg (timer);
     NgProfiler::StartTimer (timer1);
 
     CheckMeshApproximation (mesh);
diff --git a/libsrc/occ/occgenmesh.cpp b/libsrc/occ/occgenmesh.cpp
index 14fa5374..a41ce215 100644
--- a/libsrc/occ/occgenmesh.cpp
+++ b/libsrc/occ/occgenmesh.cpp
@@ -899,8 +899,8 @@ namespace netgen
 
       multithread.task = "Optimizing surface";
 
-      static int timer_opt2d = NgProfiler::CreateTimer ("Optimization 2D");
-      NgProfiler::StartTimer (timer_opt2d);
+      static Timer timer_opt2d("Optimization 2D");
+      timer_opt2d.Start();
 
       for (k = 1; k <= mesh.GetNFD(); k++)
       {
@@ -974,8 +974,7 @@ namespace netgen
 
       mesh.CalcSurfacesOfNode();
       mesh.Compress();
-
-      NgProfiler::StopTimer (timer_opt2d);
+      timer_opt2d.Stop();
 
       multithread.task = savetask;