diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 162f5c5aed2b2126fb76b70a376ad668481e6b57..83d8ec9cbedc458bf8e98ae9233f757f17fbe1dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ format:
     <<: *global_tag_def
     stage: build
     script:
-        - clang-format --version # the use should use this version too!
+        - clang-format --version # the user should use this version too!
         - ./scripts/format_code.py
         - mkdir -p patches
         - if git diff --patch --exit-code > patches/clang-format.patch; then echo "Clang format changed nothing"; else echo "Clang format found changes to make!"; false; fi
diff --git a/fwk/_src/wCppBuf2Py.h b/fwk/_src/wCppBuf2Py.h
index 7dafad9873d62bc076c1214aa368d184eb1b39b4..91927d932be226786eafb8f1e040af21baad3118 100644
--- a/fwk/_src/wCppBuf2Py.h
+++ b/fwk/_src/wCppBuf2Py.h
@@ -49,7 +49,7 @@ protected:
     virtual std::streamsize xsputn(const char *s, std::streamsize n);
     virtual int_type overflow(int c);
 };
-#endif //SWIG
+#endif // SWIG
 
 /**
  * @brief redirect std::cout/std::cerr to python sys.stdout/sys.stderr
@@ -66,4 +66,4 @@ public:
     static void test();
 };
 
-#endif //CPPBUF2PY_H
+#endif // CPPBUF2PY_H
diff --git a/fwk/src/fwk.cpp b/fwk/src/fwk.cpp
index 9f54df7c0dabf628394e697dfe23abea8b27abe5..9b1e04be8e5ebf2ada05b2e5e67c137014b81e0b 100644
--- a/fwk/src/fwk.cpp
+++ b/fwk/src/fwk.cpp
@@ -34,7 +34,7 @@ FWK_API void testswig(bool i) // testswig(3.0) displays 1 (no error and cast flo
 
 /**
  * @brief Enable Floating Point Exception
- * 
+ *
  * Imported from Metafor
  * @authors Adrien Crovato
  */
@@ -55,7 +55,7 @@ FWK_API void enableFpe()
 #else // defined(WIN32)
     std::cout << ANSI_COLOR_YELLOW << "Floating-Point Exceptions not implemented for this compiler!" << ANSI_COLOR_RESET << std::endl;
 #endif
-#endif //!defined(__MINGW32__)
+#endif //! defined(__MINGW32__)
 }
 
 /**
diff --git a/fwk/src/fwk.h b/fwk/src/fwk.h
index aa82a1db9d8b9938ce6f4428712b9fb013b97932..2505856d846377b84fb8a288d364ed4ac0cdcebf 100644
--- a/fwk/src/fwk.h
+++ b/fwk/src/fwk.h
@@ -64,4 +64,4 @@ FWK_API void testswig(bool i);
 FWK_API void enableFpe();
 FWK_API void disableFpe();
 
-#endif //FWK_H
+#endif // FWK_H
diff --git a/fwk/src/wExtract.h b/fwk/src/wExtract.h
index d6ee00317e54c2ac332cccc5122b3d14e4938e02..b2df4a9f504a23bd3b7e0746dc83e5d894aaa62f 100644
--- a/fwk/src/wExtract.h
+++ b/fwk/src/wExtract.h
@@ -41,4 +41,4 @@ public:
 
 } // namespace fwk
 
-#endif //WEXTRACT_H
+#endif // WEXTRACT_H
diff --git a/fwk/src/wHMSTime.h b/fwk/src/wHMSTime.h
index 6af798d6324a90e4ac11f9e27f5f512ed2ec203d..5f541bf5da29b7023e979a38d2571cc305942d2d 100644
--- a/fwk/src/wHMSTime.h
+++ b/fwk/src/wHMSTime.h
@@ -43,4 +43,4 @@ public:
 };
 } // namespace fwk
 
-#endif //WHMSTIME_H
+#endif // WHMSTIME_H
diff --git a/fwk/src/wObject.h b/fwk/src/wObject.h
index 663a8b98bd3e1eed5045399902d3bbd7f741ff41..ca4b23a4116ed3ab1b0f866cb6469aed4e32c77c 100644
--- a/fwk/src/wObject.h
+++ b/fwk/src/wObject.h
@@ -71,4 +71,4 @@ public:
 
 } // namespace fwk
 
-#endif //WOBJECT_H
+#endif // WOBJECT_H
diff --git a/fwk/src/wObserver.h b/fwk/src/wObserver.h
index cabc058cc05eafab878f55a4f514490c8613e12d..43ba5ad33835f27ef723a05c6a669c513eff98e1 100644
--- a/fwk/src/wObserver.h
+++ b/fwk/src/wObserver.h
@@ -36,4 +36,4 @@ public:
 
 } // namespace fwk
 
-#endif //WOBSERVER_H
+#endif // WOBSERVER_H
diff --git a/fwk/src/wTime.h b/fwk/src/wTime.h
index c782967cb58c8486dc1c5ee6977d204bd57a9621..c6e6077918a9217dee78f5a54b9d7a61d5778157 100644
--- a/fwk/src/wTime.h
+++ b/fwk/src/wTime.h
@@ -59,7 +59,7 @@ public:
     Int64Time operator-(Int64Time const &obj) const { return Int64Time(time - obj.time); }
 };
 
-#else //WIN32
+#else // WIN32
 
 class FWK_API UnixClockTime : public Time
 {
@@ -73,7 +73,7 @@ public:
     UnixClockTime operator-(UnixClockTime const &obj) const { return UnixClockTime(time - obj.time); }
 };
 
-#endif //WIN32
+#endif // WIN32
 
 //-----------------------------------------------------------------------------------------
 
@@ -109,7 +109,7 @@ public:
     DblTime operator-(DblTime const &obj) const { return DblTime(time - obj.time); }
 };
 
-#endif //SWIG
+#endif // SWIG
 
 };     // namespace fwk
-#endif //WTIME_H
+#endif // WTIME_H
diff --git a/fwk/src/wTimer.h b/fwk/src/wTimer.h
index 2a96058780b227082562b1bfa46c640ff8664120..86a97b8cd4dca39ac5fd11a4a4c72e6c6d962977 100644
--- a/fwk/src/wTimer.h
+++ b/fwk/src/wTimer.h
@@ -53,4 +53,4 @@ public:
 #endif
 };
 };     // namespace fwk
-#endif //TIMER_H
+#endif // TIMER_H
diff --git a/fwk/src/wTimers.h b/fwk/src/wTimers.h
index 779994be6e43ae23b50cd51d96b4e5e3a6931679..80d385beafbe137796b8f144f1892f640c6be4ee 100644
--- a/fwk/src/wTimers.h
+++ b/fwk/src/wTimers.h
@@ -44,4 +44,4 @@ public:
 #endif
 };
 };     // namespace fwk
-#endif //TIMERS_H
+#endif // TIMERS_H
diff --git a/fwk/src/wTimes.h b/fwk/src/wTimes.h
index 42c17ce8d7d77153e78c31dd26af0d9aaa1b1148..d71a593dbf8e79ac36b426b8a014d00fdef80459 100644
--- a/fwk/src/wTimes.h
+++ b/fwk/src/wTimes.h
@@ -72,4 +72,4 @@ public:
 
 #include "wTimes.inl"
 };     // namespace fwk
-#endif //WTIMES_H
+#endif // WTIMES_H
diff --git a/scripts/format_code.py b/scripts/format_code.py
index 15e3afcbacfe3eaa0e6eed0d47b21ff776df5d00..a976b087483fa8d4d5d4aaf0ccb45d21ba4d7f27 100755
--- a/scripts/format_code.py
+++ b/scripts/format_code.py
@@ -43,7 +43,7 @@ def main():
     encs = {}
     for f in all_files(os.getcwd(), patterns='*.cpp;*.c;*.h;*.hpp'):
         # print(f)
-        cmd = ['clang-format', "-style=file", "-i", f]
+        cmd = ['clang-format-14', "-style=file", "-i", f]
         retcode = subprocess.call(cmd)
         if retcode != 0:
             print(f'ERROR: retcode = {retcode}')
diff --git a/tbox/src/eigen_extra.h b/tbox/src/eigen_extra.h
index 09559a7352d5decefff4b6f9904e977d9d5cc0ad..3267cffd384b794d187f4ca8b0eefcbc8ed515bb 100644
--- a/tbox/src/eigen_extra.h
+++ b/tbox/src/eigen_extra.h
@@ -28,4 +28,4 @@ TBOX_API void
 tomatlab(std::string const &fname, Eigen::SparseMatrix<double> const &A);
 }
 
-#endif //EIGEN_EXTRA_H
+#endif // EIGEN_EXTRA_H
diff --git a/tbox/src/std_extra.h b/tbox/src/std_extra.h
index 16b70c1a3c3b4035c76f8be764c4e83cd8b0e451..1a3a0fcb6bfcbc1460a77c729c5bce7d214142c0 100644
--- a/tbox/src/std_extra.h
+++ b/tbox/src/std_extra.h
@@ -40,4 +40,4 @@ ostream &operator<<(ostream &out, vector<T> const &v)
 
 } // namespace std
 
-#endif //STD_EXTRA_H
+#endif // STD_EXTRA_H
diff --git a/tbox/src/tbox.h b/tbox/src/tbox.h
index d13650219ec96bdffc6662d3759f9a2c19ce4ebd..cae0a4bdc2bb3561bc7519d26d95780721cb5431 100644
--- a/tbox/src/tbox.h
+++ b/tbox/src/tbox.h
@@ -109,4 +109,4 @@ class UnitTest;
 
 } // namespace tbox
 
-#endif //TBOX_H
+#endif // TBOX_H
diff --git a/tbox/src/wCache.h b/tbox/src/wCache.h
index f20921ce6c6e9d7013dbefea2bddc297c8c434f7..bbca45591ac071e5a71d3999f282cc732c566dc8 100644
--- a/tbox/src/wCache.h
+++ b/tbox/src/wCache.h
@@ -49,4 +49,4 @@ public:
 
 } // namespace tbox
 
-#endif //WCACHE_H
+#endif // WCACHE_H
diff --git a/tbox/src/wCacheHex8.h b/tbox/src/wCacheHex8.h
index 212dba307b2dbc29cf9855dd871a01f35c9af6b8..e5f7321a5c57ac1724b75852b13d703a8e93581c 100644
--- a/tbox/src/wCacheHex8.h
+++ b/tbox/src/wCacheHex8.h
@@ -43,4 +43,4 @@ public:
 
 } // namespace tbox
 
-#endif //WCACHEHEX8_H
+#endif // WCACHEHEX8_H
diff --git a/tbox/src/wCacheLine2.h b/tbox/src/wCacheLine2.h
index a912013a09f760f6114835a05e2241c1de55e3b7..23aa9e316bdba85e1dac349b1521ed33734a8c6e 100644
--- a/tbox/src/wCacheLine2.h
+++ b/tbox/src/wCacheLine2.h
@@ -43,4 +43,4 @@ public:
 
 } // namespace tbox
 
-#endif //WCACHELINE2_H
+#endif // WCACHELINE2_H
diff --git a/tbox/src/wCachePoint1.h b/tbox/src/wCachePoint1.h
index 9d5f290b1f2c46d89e8d3c926d52eab2eb0d45d3..11562c396eb7f1ac6c960ca28c8eb99107899f09 100644
--- a/tbox/src/wCachePoint1.h
+++ b/tbox/src/wCachePoint1.h
@@ -38,4 +38,4 @@ public:
 
 } // namespace tbox
 
-#endif //WCACHEPOINT1_H
+#endif // WCACHEPOINT1_H
diff --git a/tbox/src/wCacheQuad4.h b/tbox/src/wCacheQuad4.h
index 49a2fb1e5ca9d38e6ac851f02aa957389240a7d1..03af2fd457a979a549b886f55e7b020b3c81e37f 100644
--- a/tbox/src/wCacheQuad4.h
+++ b/tbox/src/wCacheQuad4.h
@@ -43,4 +43,4 @@ public:
 
 } // namespace tbox
 
-#endif //WCACHEQUAD4_H
+#endif // WCACHEQUAD4_H
diff --git a/tbox/src/wCacheTetra4.h b/tbox/src/wCacheTetra4.h
index 4d1062ff11d2f0d92b0022afbad1da79247b4151..1282ee61a5601b7c50a8a38f1c28198b2ae480c2 100644
--- a/tbox/src/wCacheTetra4.h
+++ b/tbox/src/wCacheTetra4.h
@@ -43,4 +43,4 @@ public:
 
 } // namespace tbox
 
-#endif //WCACHETETRA4_H
+#endif // WCACHETETRA4_H
diff --git a/tbox/src/wCacheTri3.h b/tbox/src/wCacheTri3.h
index c7491eb7bf8822d4555337c47e6b0e11a22761f5..682c87a5f3f1ec2d6ea08622346e662a52cf477d 100644
--- a/tbox/src/wCacheTri3.h
+++ b/tbox/src/wCacheTri3.h
@@ -43,4 +43,4 @@ public:
 
 } // namespace tbox
 
-#endif //WCACHETRI3_H
+#endif // WCACHETRI3_H
diff --git a/tbox/src/wElement.h b/tbox/src/wElement.h
index 000c0fc8f7b1e8b4f0fd9a16b1833616b7a4293b..d8e1c728dc212a76b435973504d59803379ef679 100644
--- a/tbox/src/wElement.h
+++ b/tbox/src/wElement.h
@@ -134,4 +134,4 @@ public:
 
 } // namespace tbox
 
-#endif //WELEMENT_H
+#endif // WELEMENT_H
diff --git a/tbox/src/wFct0.cpp b/tbox/src/wFct0.cpp
index 2f4618d30a486290a8a2765062bfb4dc37ad319f..4c5d2994aca72c7174223469f7a82aa18463d85b 100644
--- a/tbox/src/wFct0.cpp
+++ b/tbox/src/wFct0.cpp
@@ -41,7 +41,7 @@ double PwLf::eval(double x) const
     auto it2 = it1;
     ++it2;
     if (it2 == pts.end())
-        return it1->second; //fct is a constant
+        return it1->second; // fct is a constant
     auto it3 = it2;
     ++it3;
 
diff --git a/tbox/src/wFct0.h b/tbox/src/wFct0.h
index 591b6d515c7dfe288d97dea2456d6a57b9303294..63cc7ed9e89a6240b1e5e4afd86f60462fddc6ba 100644
--- a/tbox/src/wFct0.h
+++ b/tbox/src/wFct0.h
@@ -122,4 +122,4 @@ public:
 
 } // namespace tbox
 
-#endif //WFCT0_H
+#endif // WFCT0_H
diff --git a/tbox/src/wFct1.h b/tbox/src/wFct1.h
index f82320d1fa59a4ef2d6ba1844fefe543b178e6b4..c967590614fab085dbb7d93488953d2e5893878a 100644
--- a/tbox/src/wFct1.h
+++ b/tbox/src/wFct1.h
@@ -79,4 +79,4 @@ public:
 
 } // namespace tbox
 
-#endif //WFCT1_H
+#endif // WFCT1_H
diff --git a/tbox/src/wFct2.cpp b/tbox/src/wFct2.cpp
index 9abe21bcab28f8a8edb6f3ea6c55f562b3814421..5d50c5f31bd78db0b563ffae359b4c4d66f96287 100644
--- a/tbox/src/wFct2.cpp
+++ b/tbox/src/wFct2.cpp
@@ -105,7 +105,7 @@ void Fct2UdU::eval(Element const &e,
     for (size_t i = 0; i < e.nodes.size(); ++i)
         upg += ff(i) * u[e.nodes[i]->row];
 
-    //gradU au pg => gradupg
+    // gradU au pg => gradupg
     Eigen::VectorXd gradupg = e.computeGradient(u, k);
 
     this->eval(e, k, upg, gradupg, out, fake);
diff --git a/tbox/src/wFct2.h b/tbox/src/wFct2.h
index ed200d74d3bae6a569e369132c21a3503a671ca7..86f49fba36594c32f579f6eada554e9b4024c529 100644
--- a/tbox/src/wFct2.h
+++ b/tbox/src/wFct2.h
@@ -28,7 +28,7 @@ namespace tbox
 
 /**
  * @brief Matrix functions to be integrated over an element
- * 
+ *
  * eval() evaluates the function at kth Gauss point
  * @authors Romain Boman
  */
@@ -138,4 +138,4 @@ public:
 
 } // namespace tbox
 
-#endif //WFCT2_H
+#endif // WFCT2_H
diff --git a/tbox/src/wGauss.h b/tbox/src/wGauss.h
index 02409ad65c3b2759e73ced9d084d310266ed07ba..c22be94db595d82f9079dd77e4277ee1a0e5dd6b 100644
--- a/tbox/src/wGauss.h
+++ b/tbox/src/wGauss.h
@@ -48,4 +48,4 @@ public:
 
 } // namespace tbox
 
-#endif //WGAUSS_H
+#endif // WGAUSS_H
diff --git a/tbox/src/wGaussHex8.h b/tbox/src/wGaussHex8.h
index 7208fca188488f2d52b9563cd15b85634547a6e0..35054b6c7dbec18b58bbb12576b6031f798e70df 100644
--- a/tbox/src/wGaussHex8.h
+++ b/tbox/src/wGaussHex8.h
@@ -35,4 +35,4 @@ public:
 
 } // namespace tbox
 
-#endif //WGAUSSHEX8_H
+#endif // WGAUSSHEX8_H
diff --git a/tbox/src/wGaussLine2.h b/tbox/src/wGaussLine2.h
index f836fbaddcdf341d188c33e8fafdcf6f82bfad45..b6023abfb369541031c26694eb62433830ba3b5f 100644
--- a/tbox/src/wGaussLine2.h
+++ b/tbox/src/wGaussLine2.h
@@ -35,4 +35,4 @@ public:
 
 } // namespace tbox
 
-#endif //WGAUSSLINE2_H
+#endif // WGAUSSLINE2_H
diff --git a/tbox/src/wGaussQuad4.h b/tbox/src/wGaussQuad4.h
index e2a5c858408350e527134469a043bbf07d726a00..b55d12bcdf9a1d5938419c7320089fab8513e27b 100644
--- a/tbox/src/wGaussQuad4.h
+++ b/tbox/src/wGaussQuad4.h
@@ -35,4 +35,4 @@ public:
 
 } // namespace tbox
 
-#endif //WGAUSSQUAD4_H
+#endif // WGAUSSQUAD4_H
diff --git a/tbox/src/wGaussTetra4.h b/tbox/src/wGaussTetra4.h
index abc4daedb9e54f320cce9d5f76041efb725cabb5..17ced4bcf7977f891c9d4c594b1c24f569bf3495 100644
--- a/tbox/src/wGaussTetra4.h
+++ b/tbox/src/wGaussTetra4.h
@@ -35,4 +35,4 @@ public:
 
 } // namespace tbox
 
-#endif //WGAUSSTETRA4_H
+#endif // WGAUSSTETRA4_H
diff --git a/tbox/src/wGaussTri3.h b/tbox/src/wGaussTri3.h
index ee8291cc261c73d698b47a597ec39aa4938820b2..e708d5f63ff4da9dd56a5a213ff24b733f37a37d 100644
--- a/tbox/src/wGaussTri3.h
+++ b/tbox/src/wGaussTri3.h
@@ -35,4 +35,4 @@ public:
 
 } // namespace tbox
 
-#endif //WGAUSSTRI3_H
+#endif // WGAUSSTRI3_H
diff --git a/tbox/src/wGmshImport.h b/tbox/src/wGmshImport.h
index 6afac56488096c09ca4ef2351068d1da9c8cf5b1..611d95b254fa0da63bcc92908832d2698787db1b 100644
--- a/tbox/src/wGmshImport.h
+++ b/tbox/src/wGmshImport.h
@@ -59,4 +59,4 @@ public:
 
 } // namespace tbox
 
-#endif //WGMSHIMPORT_H
+#endif // WGMSHIMPORT_H
diff --git a/tbox/src/wGroup.cpp b/tbox/src/wGroup.cpp
index b271543f2441c8da0d23f96aea35a90753eaa434..dc86d743f257a435b16dfa2f03c9c2db7e1c9ce5 100644
--- a/tbox/src/wGroup.cpp
+++ b/tbox/src/wGroup.cpp
@@ -47,7 +47,7 @@ Group::Group(std::shared_ptr<MshData> _msh, std::string const &name) : wSharedOb
             auto itn(it);
             ++itn;
             out << (it->first) << ((itn != msh->ntags.end()) ? ", " : "\n\n");
-            //out << (it->first) << ((std::next(it)!=msh->ntags.end())? ", " : "\n\n");
+            // out << (it->first) << ((std::next(it)!=msh->ntags.end())? ", " : "\n\n");
         }
         throw std::out_of_range(out.str());
     }
diff --git a/tbox/src/wGroup.h b/tbox/src/wGroup.h
index fd3e155df55d8df87f3d6b50730156ed9a7994ca..b86cfb8afa8e797aef3b2b9267684ab637c11a10 100644
--- a/tbox/src/wGroup.h
+++ b/tbox/src/wGroup.h
@@ -43,4 +43,4 @@ public:
 
 } // namespace tbox
 
-#endif //WGROUP_H
+#endif // WGROUP_H
diff --git a/tbox/src/wGroups.h b/tbox/src/wGroups.h
index 895fabc4e78622305935614f59339573c336e93c..f53f2ff07c4f8a2ed31966ad1bb8ce4b2f51c599 100644
--- a/tbox/src/wGroups.h
+++ b/tbox/src/wGroups.h
@@ -45,4 +45,4 @@ public:
 
 } // namespace tbox
 
-#endif //WGROUPS_H
+#endif // WGROUPS_H
diff --git a/tbox/src/wHex8.h b/tbox/src/wHex8.h
index fb3e427b5cc27efdd7e51f709c7cbffe75b9083e..168f6151789d5af048526e3133c1b65bd0e1d8ae 100644
--- a/tbox/src/wHex8.h
+++ b/tbox/src/wHex8.h
@@ -57,4 +57,4 @@ public:
 
 } // namespace tbox
 
-#endif //WHEX8_H
+#endif // WHEX8_H
diff --git a/tbox/src/wLazy.h b/tbox/src/wLazy.h
index ae5568d44ea457a8d074f9d1795ef85d27d22826..6b79e5e506a88d85d68cdb6db1a5ed6ce288d831 100644
--- a/tbox/src/wLazy.h
+++ b/tbox/src/wLazy.h
@@ -42,7 +42,7 @@ public:
     ~Lazy()
     {
         delete static_cast<T *>(value);
-        //std::cout << "lazy pointer deleted\n";
+        // std::cout << "lazy pointer deleted\n";
     }
     T &get()
     {
@@ -58,4 +58,4 @@ public:
 
 } // namespace tbox
 
-#endif //WLAZY_H
+#endif // WLAZY_H
diff --git a/tbox/src/wLine2.h b/tbox/src/wLine2.h
index d87928f5898f76558d3161d4493790a26d7343b6..2018cb3b72c6be479aac4ff0d66cf684fe9474a8 100644
--- a/tbox/src/wLine2.h
+++ b/tbox/src/wLine2.h
@@ -63,4 +63,4 @@ public:
 
 } // namespace tbox
 
-#endif //WLINE2_H
+#endif // WLINE2_H
diff --git a/tbox/src/wLinesearch.h b/tbox/src/wLinesearch.h
index 729fc26fd74b5023c867bc26d984b17b80ce31d4..60f5c6b3ed838185312ada9f1036983024191e77 100644
--- a/tbox/src/wLinesearch.h
+++ b/tbox/src/wLinesearch.h
@@ -81,7 +81,7 @@ public:
 
 /**
  * @brief 3-points quadratic linesearch
- * 
+ *
  * Implemented following Prof. Fleury notes, University of Liege
  * @authors Romain Boman, Adrien Crovato
  */
@@ -105,7 +105,7 @@ public:
 
 /**
  * @brief Bank and Rose linesearch
- * 
+ *
  * Implemented following Bank and Rose, Global Approximate Newton Methods, Numerische Mathematik
  * www.math.hcmuns.edu.vn/~tangoc//bbmot.pdf
  * @authors Adrien Crovato
@@ -124,4 +124,4 @@ public:
 
 #endif
 
-#endif //WLINESEARCH_H
+#endif // WLINESEARCH_H
diff --git a/tbox/src/wMshConvert.cpp b/tbox/src/wMshConvert.cpp
index dd48f05554736b46383083f81a0a29fa934adb95..7851871d78d5e9a9d1d854af39d8077e16c81c27 100644
--- a/tbox/src/wMshConvert.cpp
+++ b/tbox/src/wMshConvert.cpp
@@ -54,9 +54,9 @@ void MshConvert::ansys_gmsh(std::string const &fname1, std::string const &fname2
     if (!read_file)
         throw std::runtime_error("Error opening file 1 (load)");
 
-    //FILE *written_file = fopen(fname2.c_str(),"w");
-    //if (!written_file)
-    //    throw std::runtime_error("Error opening file 2 (load)");
+    // FILE *written_file = fopen(fname2.c_str(),"w");
+    // if (!written_file)
+    //     throw std::runtime_error("Error opening file 2 (load)");
 
     std::ofstream written_file;
     written_file.open(fname2);
@@ -221,7 +221,7 @@ void MshConvert::ansys_gmsh(std::string const &fname1, std::string const &fname2
                     continue;
 
                 sets_elems[ii].push_back(output.str());
-                //break;
+                // break;
             }
         }
     }
diff --git a/tbox/src/wMshConvert.h b/tbox/src/wMshConvert.h
index 193e4a8ced054dea66707aa5e137931abf861402..14e6abeb331029feb05664a41aa34af1c8140475 100644
--- a/tbox/src/wMshConvert.h
+++ b/tbox/src/wMshConvert.h
@@ -45,4 +45,4 @@ public:
 
 } // namespace tbox
 
-#endif //WMSHCONVERT_H
\ No newline at end of file
+#endif // WMSHCONVERT_H
\ No newline at end of file
diff --git a/tbox/src/wMshData.h b/tbox/src/wMshData.h
index d3d99f6fc39d2d719e282328edb0e056b661f837..b41d433db5397ebfe589f5ea0724650567307c00 100644
--- a/tbox/src/wMshData.h
+++ b/tbox/src/wMshData.h
@@ -54,4 +54,4 @@ public:
 
 } // namespace tbox
 
-#endif //WMSHDATA_H
+#endif // WMSHDATA_H
diff --git a/tbox/src/wMshImport.h b/tbox/src/wMshImport.h
index 07ebcf5289dc906a1df707bbe319a05e098b3f82..af9e83fab018b6b608a6ef42e515017d3c4c1afe 100644
--- a/tbox/src/wMshImport.h
+++ b/tbox/src/wMshImport.h
@@ -44,4 +44,4 @@ public:
 
 } // namespace tbox
 
-#endif //WMSHIMPORT_H
+#endif // WMSHIMPORT_H
diff --git a/tbox/src/wMumps.cpp b/tbox/src/wMumps.cpp
index 766bda3139548d1c7f64cc132662fbc27591773d..75027d0125747ae94778ebe1671ac07f1a3bcf48 100644
--- a/tbox/src/wMumps.cpp
+++ b/tbox/src/wMumps.cpp
@@ -39,7 +39,7 @@ Mumps::Mumps() : LinearSolver()
     id.ICNTL(3) = -1; // stream for global information [def=6]
     id.ICNTL(4) = 0;  // level of printing [def=2]
     // Matrix re-ordering
-    //0 : amd, 2 : amf, 3 : scotch, 4 : pord, 5 : metis, 6 :qamd, 7 : auto [def=7]
+    // 0 : amd, 2 : amf, 3 : scotch, 4 : pord, 5 : metis, 6 :qamd, 7 : auto [def=7]
     id.ICNTL(7) = 3; // defaults to scotch because mumps comes witch scotch if installed using apt
     // Error analysis
     id.ICNTL(11) = 0; // disabled
diff --git a/tbox/src/wMumps.h b/tbox/src/wMumps.h
index 535aa6f3a77f757b016c09a67eac15f1bdd230e3..dae62bd54973e6bec0fa4b1f7ebaf7172b308377 100644
--- a/tbox/src/wMumps.h
+++ b/tbox/src/wMumps.h
@@ -34,7 +34,7 @@ namespace tbox
 
 /**
  * @brief MUMPS interface
- * 
+ *
  * Reference: https://github.com/rboman/math0471/blob/master/mumps/main.cpp
  * Reference gmm_MUMPS_interface.h (old)
  * @authors Adrien Crovato
diff --git a/tbox/src/wNode.h b/tbox/src/wNode.h
index afcfd7e6d77a9a355c8992fc8965f0c2d093ad5c..a1cf7a94c6258f860006a0ea7c2ad25bd0ef2358 100644
--- a/tbox/src/wNode.h
+++ b/tbox/src/wNode.h
@@ -46,4 +46,4 @@ public:
 
 } // namespace tbox
 
-#endif //WNODE_H
+#endif // WNODE_H
diff --git a/tbox/src/wPoint1.h b/tbox/src/wPoint1.h
index b905db0db099214b61ce81a55147316d8b716465..742047a97530883fd73a2c282376063e9e40dcf2 100644
--- a/tbox/src/wPoint1.h
+++ b/tbox/src/wPoint1.h
@@ -40,4 +40,4 @@ private:
 
 } // namespace tbox
 
-#endif //WPOINT1_H
+#endif // WPOINT1_H
diff --git a/tbox/src/wQuad4.h b/tbox/src/wQuad4.h
index e50f1213e4b8872815ab6fc8392ff4fa6a5f6ec2..2deb4a4886287c8975a2040242a87f82fd284192 100644
--- a/tbox/src/wQuad4.h
+++ b/tbox/src/wQuad4.h
@@ -61,4 +61,4 @@ public:
 
 } // namespace tbox
 
-#endif //WQUAD4_H
+#endif // WQUAD4_H
diff --git a/tbox/src/wResults.h b/tbox/src/wResults.h
index 7ffa42f0f87254f3135ec33a1e2c9f363583a0e5..ee04bb753e50383e7a680e9ae2fe75d7b0bfcf05 100644
--- a/tbox/src/wResults.h
+++ b/tbox/src/wResults.h
@@ -55,4 +55,4 @@ public:
 
 } // namespace tbox
 
-#endif //WRESULTS_H
+#endif // WRESULTS_H
diff --git a/tbox/src/wSfHex8.h b/tbox/src/wSfHex8.h
index 0e599115410012eff7ac8382e971439980efc756..0692b3bcba1594cda01ff1b3ba88561c08dc2b13 100644
--- a/tbox/src/wSfHex8.h
+++ b/tbox/src/wSfHex8.h
@@ -37,4 +37,4 @@ public:
 
 } // namespace tbox
 
-#endif //WSFHEX8_H
+#endif // WSFHEX8_H
diff --git a/tbox/src/wSfLine2.h b/tbox/src/wSfLine2.h
index d29ad34f9655a94c8ab476deaf908e0beb2aa11e..d96c0df2531eb08ec817e0f2ebd51aa628598d8f 100644
--- a/tbox/src/wSfLine2.h
+++ b/tbox/src/wSfLine2.h
@@ -37,4 +37,4 @@ public:
 
 } // namespace tbox
 
-#endif //WSFLINE2_H
+#endif // WSFLINE2_H
diff --git a/tbox/src/wSfQuad4.h b/tbox/src/wSfQuad4.h
index 93ef0dab736fb358e5131aff289c3679baa2f846..38679746ed91cb7c7379dd6ba946c32aa9391cc9 100644
--- a/tbox/src/wSfQuad4.h
+++ b/tbox/src/wSfQuad4.h
@@ -37,4 +37,4 @@ public:
 
 } // namespace tbox
 
-#endif //WSFQUAD4_H
+#endif // WSFQUAD4_H
diff --git a/tbox/src/wSfTetra4.h b/tbox/src/wSfTetra4.h
index f40e8323f154cb46995586c08064c8cf1e9d821f..5ad8c8d2ebb8888021dcbc43066d5a8c89430466 100644
--- a/tbox/src/wSfTetra4.h
+++ b/tbox/src/wSfTetra4.h
@@ -37,4 +37,4 @@ public:
 
 } // namespace tbox
 
-#endif //WSFTETRA4_H
+#endif // WSFTETRA4_H
diff --git a/tbox/src/wSfTri3.h b/tbox/src/wSfTri3.h
index 5e8f22865fa37b0050405ca10c10aaf803b2e113..a9aeba7baa2649586a6c3a6eeb4e57a94317d881 100644
--- a/tbox/src/wSfTri3.h
+++ b/tbox/src/wSfTri3.h
@@ -37,4 +37,4 @@ public:
 
 } // namespace tbox
 
-#endif //WSFTRI3_H
+#endif // WSFTRI3_H
diff --git a/tbox/src/wSparseLu.h b/tbox/src/wSparseLu.h
index 84e7abef39b0d3a6cc661840f635f4cbc0f23ed3..6055f3815bd616844bafa843ec794c42e62bf45e 100644
--- a/tbox/src/wSparseLu.h
+++ b/tbox/src/wSparseLu.h
@@ -27,7 +27,7 @@ namespace tbox
 
 /**
  * @brief SparseLU interface
- * 
+ *
  * Note that SparseLU should be used with ColMajor matrices
  * @authors Adrien Crovato
  */
diff --git a/tbox/src/wTag.h b/tbox/src/wTag.h
index 0c264e623c2a1ad1a28774d76c5c9673a472779a..aeacc3e3549c9e49a2b33e9beb1e402712ce6546 100644
--- a/tbox/src/wTag.h
+++ b/tbox/src/wTag.h
@@ -57,4 +57,4 @@ public:
 
 } // namespace tbox
 
-#endif //WTAG_H
+#endif // WTAG_H
diff --git a/tbox/src/wTetra4.h b/tbox/src/wTetra4.h
index af669380e3faba104dfe7cb4aab4b133e822bce5..8e9ddfbab4456f2ab1a5238e72fcddbe75979393 100644
--- a/tbox/src/wTetra4.h
+++ b/tbox/src/wTetra4.h
@@ -60,4 +60,4 @@ public:
 
 } // namespace tbox
 
-#endif //WTETRA4_H
+#endif // WTETRA4_H
diff --git a/tbox/src/wTri3.h b/tbox/src/wTri3.h
index 6dab1db7f1147760c94a5a7fd000710f75b5cf24..29b83a88dea3f190e21f91dc6dc64dc10204a323 100644
--- a/tbox/src/wTri3.h
+++ b/tbox/src/wTri3.h
@@ -66,4 +66,4 @@ public:
 
 } // namespace tbox
 
-#endif //WTRI3_H
+#endif // WTRI3_H
diff --git a/tbox/src/wUnitTest.h b/tbox/src/wUnitTest.h
index 4a51567687dfde2e93d2978b576f44281b86c2ca..576a4b37564f9e49d105898c1c1ce42fd66fd999 100644
--- a/tbox/src/wUnitTest.h
+++ b/tbox/src/wUnitTest.h
@@ -41,4 +41,4 @@ public:
 
 } // namespace tbox
 
-#endif //WUNITTEST_H
+#endif // WUNITTEST_H
diff --git a/tboxVtk/src/tboxVtk.h b/tboxVtk/src/tboxVtk.h
index 9f9196d693ebf6965f84e48fe026dbfc4c5be992..91b0c70a148bdccd51ec2df7a33485d35e692836 100644
--- a/tboxVtk/src/tboxVtk.h
+++ b/tboxVtk/src/tboxVtk.h
@@ -40,4 +40,4 @@ namespace tboxVtk
 class vtkExport;
 } // namespace tboxVtk
 
-#endif //TBOXVTK_H
+#endif // TBOXVTK_H