diff --git a/fpm/src/fBody.cpp b/fpm/src/fBody.cpp
index 398e3c0172b91968025e28860db168cd3b348593..9ff1f894eb82e26618c2d99d2c74dd1a6dc74b80 100644
--- a/fpm/src/fBody.cpp
+++ b/fpm/src/fBody.cpp
@@ -61,7 +61,8 @@ Body::Body(std::shared_ptr<MshData> _msh, std::string const &id,
             for (auto e : te.tag->elems)
                 for (auto n : e->nodes)
                     teNodes.push_back(n);
-            std::sort(teNodes.begin(), teNodes.end(), [](Node *a, Node *b) -> bool { return a->pos(1) < b->pos(1); });
+            std::sort(teNodes.begin(), teNodes.end(), [](Node *a, Node *b) -> bool
+                      { return a->pos(1) < b->pos(1); });
             teNodes.erase(std::unique(teNodes.begin(), teNodes.end()), teNodes.end());
             // Translate TE nodes (along x-coordinate)
             std::vector<Node *> wkNodes;
@@ -104,7 +105,7 @@ Body::Body(std::shared_ptr<MshData> _msh, std::string const &id,
                     }
                     catch (const std::out_of_range &)
                     {
-                        //std::cout << lwe->nodes[i]->no << "not found in map!\n";
+                        // std::cout << lwe->nodes[i]->no << "not found in map!\n";
                     }
                 }
             }
diff --git a/fpm/src/fBody.h b/fpm/src/fBody.h
index 181af38f670c9699a95aca280a52f37cec84b47c..90f29c599829bf327795a3b88277617bf6d52f96 100644
--- a/fpm/src/fBody.h
+++ b/fpm/src/fBody.h
@@ -55,4 +55,4 @@ public:
 
 } // namespace fpm
 
-#endif //FBODY_H
+#endif // FBODY_H
diff --git a/fpm/src/fBuilder.h b/fpm/src/fBuilder.h
index 10069df62cfa39d00a31dbe792b3d788ec7f6540..9f5868414cd044510e26428a8902cb6f09f27ab8 100644
--- a/fpm/src/fBuilder.h
+++ b/fpm/src/fBuilder.h
@@ -73,4 +73,4 @@ private:
 };
 
 } // namespace fpm
-#endif //FBUILDER_H
+#endif // FBUILDER_H
diff --git a/fpm/src/fEdge.h b/fpm/src/fEdge.h
index 959675c9f0ac289117855b9917db7ce3d206b909..f5d01e665bda96ba2ff97ae9532d6039fd05d547 100644
--- a/fpm/src/fEdge.h
+++ b/fpm/src/fEdge.h
@@ -90,4 +90,4 @@ public:
 } // namespace fpm
 #endif
 
-#endif //FEDGE_H
+#endif // FEDGE_H
diff --git a/fpm/src/fField.h b/fpm/src/fField.h
index 360c422e0725f4a5e2af133b3b7b6fef4a2755e5..613dc58884784aa92a005d843d3dc408e8d1b46d 100644
--- a/fpm/src/fField.h
+++ b/fpm/src/fField.h
@@ -40,4 +40,4 @@ public:
 
 } // namespace fpm
 
-#endif //FFIELD_H
+#endif // FFIELD_H
diff --git a/fpm/src/fProblem.cpp b/fpm/src/fProblem.cpp
index f2409059bc6916a0a70c775fdd4f6984bb3865d3..b9cb64b255e3042fcd2cc3b9a5a1ea09a199bc18 100644
--- a/fpm/src/fProblem.cpp
+++ b/fpm/src/fProblem.cpp
@@ -206,7 +206,7 @@ double Problem::Cp(Eigen::Vector3d U)
         return 1 - u.dot(u);
     else
     {
-        //particularized: 2 / (gamma * mInf * mInf) * (pow(1 + 0.5 * (gamma - 1) * mInf * mInf * (1 - gradU2), gamma / (gamma - 1)) - 1);
+        // particularized: 2 / (gamma * mInf * mInf) * (pow(1 + 0.5 * (gamma - 1) * mInf * mInf * (1 - gradU2), gamma / (gamma - 1)) - 1);
         double a = 1 + 0.2 * mach * mach * (1 - u.dot(u));
         return 2 / (1.4 * mach * mach) * (sqrt(a * a * a * a * a * a * a) - 1);
     }
@@ -257,21 +257,21 @@ void Problem::check() const
     // Volume elements
     if (field)
         for (auto e : field->tag->elems)
-            if (e->type() != ELTYPE::HEX8)
+            if (e->type() != ElType::HEX8)
             {
                 std::stringstream err;
                 err << "FPM solver is only implemented for surface elements of type "
-                    << ELTYPE::HEX8 << " (" << e->type() << " was given)!\n";
+                    << ElType::HEX8 << " (" << e->type() << " was given)!\n";
                 throw std::runtime_error(err.str());
             }
     // Surface elements
     for (auto b : bodies)
         for (auto e : b->tag->elems)
-            if (e->type() != ELTYPE::QUAD4)
+            if (e->type() != ElType::QUAD4)
             {
                 std::stringstream err;
                 err << "FPM solver is only implemented for surface elements of type "
-                    << ELTYPE::QUAD4 << " (" << e->type() << " was given)!\n";
+                    << ElType::QUAD4 << " (" << e->type() << " was given)!\n";
                 throw std::runtime_error(err.str());
             }
 }
diff --git a/fpm/src/fProblem.h b/fpm/src/fProblem.h
index 3cdd15c59197ba8b06487b6ab63e75bf22ab0091..ab962b23b1ea4620a67ae4ad1f7d0097ef8515a9 100644
--- a/fpm/src/fProblem.h
+++ b/fpm/src/fProblem.h
@@ -71,4 +71,4 @@ public:
 
 } // namespace fpm
 
-#endif //FPROBLEM_H
+#endif // FPROBLEM_H
diff --git a/fpm/src/fSolver.h b/fpm/src/fSolver.h
index c2cdb1a6c04cdeedb52b0642092a156efcd0424c..deacab6a9232407e9302a67860836af2a793e448 100644
--- a/fpm/src/fSolver.h
+++ b/fpm/src/fSolver.h
@@ -68,4 +68,4 @@ private:
 };
 
 } // namespace fpm
-#endif //FSOLVER_H
+#endif // FSOLVER_H
diff --git a/fpm/src/fTimers.h b/fpm/src/fTimers.h
index e08840b545098430c1267a96b62bb6138474da09..c9c6537d39d56425c19ff6de108ac79bf9ae79a7 100644
--- a/fpm/src/fTimers.h
+++ b/fpm/src/fTimers.h
@@ -70,9 +70,9 @@ public:
 #ifndef SWIG
     Timer &operator[](std::string const &name);
     virtual void write(std::ostream &out) const override;
-#endif //SWIG
+#endif // SWIG
 };
 
 } // namespace fpm
 
-#endif //FTIMERS_H
+#endif // FTIMERS_H
diff --git a/fpm/src/fWake.h b/fpm/src/fWake.h
index 6d725aca260793b44ef9449e450125f391072b62..45da0911d17b7991100d1f274625b119adfda45d 100644
--- a/fpm/src/fWake.h
+++ b/fpm/src/fWake.h
@@ -44,4 +44,4 @@ public:
 
 } // namespace fpm
 
-#endif //FWAKE_H
+#endif // FWAKE_H
diff --git a/fpm/src/fpm.h b/fpm/src/fpm.h
index 676bbd8ed209d11f4c9c44c34d6a32571e924f10..73c4bbfa63366f71c9b0f4a4410cd7184758e6e6 100644
--- a/fpm/src/fpm.h
+++ b/fpm/src/fpm.h
@@ -54,4 +54,4 @@ class EquEdge;
 
 } // namespace fpm
 
-#endif //FPM_H
+#endif // FPM_H