diff --git a/MaterialLib/MPL/CreateProperty.cpp b/MaterialLib/MPL/CreateProperty.cpp
index 80928ee14e396719cc6d479e432d3d65a52c7106..47e9f9af2fbcd0c345d8528f7f7a20af0b4aba95 100644
--- a/MaterialLib/MPL/CreateProperty.cpp
+++ b/MaterialLib/MPL/CreateProperty.cpp
@@ -81,10 +81,11 @@ std::unique_ptr<MaterialPropertyLib::Property> createProperty(
         return createDupuitPermeability(config, parameters);
     }
 
-    if (boost::iequals(property_type, "EffectiveThermalConductivityPorosityMixing"))
+    if (boost::iequals(property_type,
+                       "EffectiveThermalConductivityPorosityMixing"))
     {
         return createEffectiveThermalConductivityPorosityMixing(
-                geometry_dimension, config, local_coordinate_system);
+            geometry_dimension, config, local_coordinate_system);
     }
 
     if (boost::iequals(property_type, "IdealGasLaw"))
@@ -109,7 +110,8 @@ std::unique_ptr<MaterialPropertyLib::Property> createProperty(
         return createEmbeddedFracturePermeability(geometry_dimension, config);
     }
 
-    if (boost::iequals(property_type, "OrthotropicEmbeddedFracturePermeability"))
+    if (boost::iequals(property_type,
+                       "OrthotropicEmbeddedFracturePermeability"))
     {
         return createOrthotropicEmbeddedFracturePermeability(
             geometry_dimension, config, parameters);
diff --git a/MaterialLib/MPL/Properties/CreateProperties.h b/MaterialLib/MPL/Properties/CreateProperties.h
index 65dccd0d87cb822a75cf2e0e049839dc48cbb25d..312a4e26493b056b829a468f3d29fd6500090011 100644
--- a/MaterialLib/MPL/Properties/CreateProperties.h
+++ b/MaterialLib/MPL/Properties/CreateProperties.h
@@ -37,8 +37,8 @@
 #include "CreatePermeabilityMohrCoulombFailureIndexModel.h"
 #include "CreatePermeabilityOrthotropicPowerLaw.h"
 #include "CreatePorosityFromMassBalance.h"
-#include "CreateSaturationDependentThermalConductivity.h"
 #include "CreateSaturationDependentSwelling.h"
+#include "CreateSaturationDependentThermalConductivity.h"
 #include "CreateStrainDependentPermeability.h"
 #include "CreateTransportPorosityFromMassBalance.h"
 #include "Density/CreateWaterVapourDensity.h"
diff --git a/MaterialLib/MPL/Properties/Properties.h b/MaterialLib/MPL/Properties/Properties.h
index 4126fb95e0e2ae9e0312430bc002644a86ae53ec..154a191536d7e9775025d3a66b5fedeaa196d96d 100644
--- a/MaterialLib/MPL/Properties/Properties.h
+++ b/MaterialLib/MPL/Properties/Properties.h
@@ -42,8 +42,8 @@
 #include "RelativePermeability/RelPermUdell.h"
 #include "RelativePermeability/RelPermUdellNonwettingPhase.h"
 #include "RelativePermeability/RelPermVanGenuchten.h"
-#include "SaturationDependentThermalConductivity.h"
 #include "SaturationDependentSwelling.h"
+#include "SaturationDependentThermalConductivity.h"
 #include "ThermalConductivity/SoilThermalConductivitySomerton.h"
 #include "TransportPorosityFromMassBalance.h"
 #include "VapourDiffusion/VapourDiffusionFEBEX.h"
diff --git a/ProcessLib/ComponentTransport/ComponentTransportFEM.h b/ProcessLib/ComponentTransport/ComponentTransportFEM.h
index d90de33aadf9621914479cfcf42df999b5780b83..b842ab8803555a3b2d7218261691f099570b542a 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportFEM.h
+++ b/ProcessLib/ComponentTransport/ComponentTransportFEM.h
@@ -43,7 +43,8 @@ struct IntegrationPointData final
                          GlobalDimNodalMatrixType const& dNdx_,
                          double const& integration_weight_)
         : N(N_), dNdx(dNdx_), integration_weight(integration_weight_)
-    {}
+    {
+    }
 
     void pushBackState() { porosity_prev = porosity; }
 
@@ -236,10 +237,12 @@ public:
             _integration_method.getNumberOfPoints();
         for (unsigned ip = 0; ip < n_integration_points; ip++)
         {
-            _ip_data[ip].chemical_system_id = chemical_system_index_map.empty()
-                                     ? 0
-                                     : chemical_system_index_map.back() + 1;
-            chemical_system_index_map.push_back(_ip_data[ip].chemical_system_id);
+            _ip_data[ip].chemical_system_id =
+                chemical_system_index_map.empty()
+                    ? 0
+                    : chemical_system_index_map.back() + 1;
+            chemical_system_index_map.push_back(
+                _ip_data[ip].chemical_system_id);
         }
     }
 
@@ -679,8 +682,8 @@ public:
                               .template value<double>(vars, vars_prev, pos, t,
                                                       dt);
 
-                vars[static_cast<int>(MaterialPropertyLib::Variable::porosity)] =
-                        porosity;
+                vars[static_cast<int>(
+                    MaterialPropertyLib::Variable::porosity)] = porosity;
             }
 
             // Use the fluid density model to compute the density
@@ -809,8 +812,8 @@ public:
                               .template value<double>(vars, vars_prev, pos, t,
                                                       dt);
 
-                vars[static_cast<int>(MaterialPropertyLib::Variable::porosity)] =
-                        porosity;
+                vars[static_cast<int>(
+                    MaterialPropertyLib::Variable::porosity)] = porosity;
             }
 
             auto const& retardation_factor =