diff --git a/ChemistryLib/Common/CreateChargeBalance.cpp b/ChemistryLib/Common/CreateChargeBalance.cpp
index 71f9109d502e19e4dcd86356aebb5876eb84e1c9..8bd7656505bbd3343c3ec3e1fad0aa8c29b9ae58 100644
--- a/ChemistryLib/Common/CreateChargeBalance.cpp
+++ b/ChemistryLib/Common/CreateChargeBalance.cpp
@@ -9,6 +9,7 @@
  */
 
 #include "CreateChargeBalance.h"
+
 #include "BaseLib/ConfigTree.h"
 #include "BaseLib/Error.h"
 #include "ChargeBalance.h"
diff --git a/ChemistryLib/PhreeqcIO.cpp b/ChemistryLib/PhreeqcIO.cpp
index c7a94b23b9aecec52e13be41e3f7008b45e7c541..ff46aeec8cb1d0755d2f3d4903e581e65af89686 100644
--- a/ChemistryLib/PhreeqcIO.cpp
+++ b/ChemistryLib/PhreeqcIO.cpp
@@ -243,14 +243,14 @@ void PhreeqcIO::initializeChemicalSystemConcrete(
 
     for (auto& kinetic_reactant : _chemical_system->kinetic_reactants)
     {
-        initializeReactantMolality(kinetic_reactant, chemical_system_id, medium, pos,
-                            t);
+        initializeReactantMolality(kinetic_reactant, chemical_system_id, medium,
+                                   pos, t);
     }
 
     for (auto& equilibrium_reactant : _chemical_system->equilibrium_reactants)
     {
-        initializeReactantMolality(equilibrium_reactant, chemical_system_id, medium,
-                            pos, t);
+        initializeReactantMolality(equilibrium_reactant, chemical_system_id,
+                                   medium, pos, t);
     }
 }
 
diff --git a/ChemistryLib/PhreeqcIOData/AqueousSolution.cpp b/ChemistryLib/PhreeqcIOData/AqueousSolution.cpp
index 21e5c260affabc701f2a7d8d49c403a8f37dc620..71cd09cdb1b900209d6d51c898331decd3734e8c 100644
--- a/ChemistryLib/PhreeqcIOData/AqueousSolution.cpp
+++ b/ChemistryLib/PhreeqcIOData/AqueousSolution.cpp
@@ -8,10 +8,11 @@
  *
  */
 
+#include "AqueousSolution.h"
+
 #include <cmath>
 #include <ostream>
 
-#include "AqueousSolution.h"
 #include "ChemistryLib/Common/ChargeBalance.h"
 #include "MeshLib/PropertyVector.h"
 
diff --git a/ChemistryLib/PhreeqcIOData/ChemicalSystem.cpp b/ChemistryLib/PhreeqcIOData/ChemicalSystem.cpp
index 1382ba202359b5fd0fc9316c5a2da996de6b35f3..c75360983d062a7df1ea19b962672315df389a05 100644
--- a/ChemistryLib/PhreeqcIOData/ChemicalSystem.cpp
+++ b/ChemistryLib/PhreeqcIOData/ChemicalSystem.cpp
@@ -9,8 +9,8 @@
  */
 
 #include "ChemicalSystem.h"
-#include "AqueousSolution.h"
 
+#include "AqueousSolution.h"
 #include "MathLib/LinAlg/MatrixVectorTraits.h"
 #include "MathLib/LinAlg/UnifiedMatrixSetters.h"
 
diff --git a/ChemistryLib/PhreeqcIOData/CreateAqueousSolution.cpp b/ChemistryLib/PhreeqcIOData/CreateAqueousSolution.cpp
index 3260c28cab8c6076860518802eae42d29c9c2707..10ce53a98deb0dd0e27d4a58f29ace085f97f067 100644
--- a/ChemistryLib/PhreeqcIOData/CreateAqueousSolution.cpp
+++ b/ChemistryLib/PhreeqcIOData/CreateAqueousSolution.cpp
@@ -9,6 +9,7 @@
  */
 
 #include "CreateAqueousSolution.h"
+
 #include "AqueousSolution.h"
 #include "BaseLib/ConfigTree.h"
 #include "ChemistryLib/Common/CreateChargeBalance.h"
diff --git a/ChemistryLib/PhreeqcIOData/CreateChemicalSystem.cpp b/ChemistryLib/PhreeqcIOData/CreateChemicalSystem.cpp
index 0de89dbe61961f055a7aa022d572e22c26f7a4ca..eebaf94479355c98c4d3d0bad5592ff973ae9e22 100644
--- a/ChemistryLib/PhreeqcIOData/CreateChemicalSystem.cpp
+++ b/ChemistryLib/PhreeqcIOData/CreateChemicalSystem.cpp
@@ -9,6 +9,7 @@
  */
 
 #include "CreateChemicalSystem.h"
+
 #include "BaseLib/ConfigTree.h"
 #include "ChemicalSystem.h"
 #include "CreateAqueousSolution.h"
diff --git a/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.cpp b/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.cpp
index 366c3e0a75015f31fbe4275b7fce8416c97cb46b..142a66c9fc816e930d89f0465108dce810eaf1be 100644
--- a/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.cpp
+++ b/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.cpp
@@ -53,8 +53,11 @@ std::vector<EquilibriumReactant> createEquilibriumReactants(
             mesh, name + "_avg", MeshLib::MeshItemType::Cell, 1);
         mesh_prop_molality->resize(mesh.getNumberOfElements());
 
-        equilibrium_reactants.emplace_back(
-            std::move(name), molality, volume_fraction, mesh_prop_molality, saturation_index);
+        equilibrium_reactants.emplace_back(std::move(name),
+                                           molality,
+                                           volume_fraction,
+                                           mesh_prop_molality,
+                                           saturation_index);
     }
 
     return equilibrium_reactants;
diff --git a/ChemistryLib/PhreeqcIOData/CreateKnobs.cpp b/ChemistryLib/PhreeqcIOData/CreateKnobs.cpp
index 067d1587788bc099e06707a615c151fd9c6fd6b3..5fd589c6bc759cd6f066755ef2ee8ad6e5c6bd3f 100644
--- a/ChemistryLib/PhreeqcIOData/CreateKnobs.cpp
+++ b/ChemistryLib/PhreeqcIOData/CreateKnobs.cpp
@@ -9,6 +9,7 @@
  */
 
 #include "CreateKnobs.h"
+
 #include "BaseLib/ConfigTree.h"
 #include "Knobs.h"
 
diff --git a/ChemistryLib/PhreeqcIOData/CreateOutput.cpp b/ChemistryLib/PhreeqcIOData/CreateOutput.cpp
index 260e22bc626b75bd534d7f6b6e4f8484e5c93052..7e96d01617b691874d622d5e61899643ea96d590 100644
--- a/ChemistryLib/PhreeqcIOData/CreateOutput.cpp
+++ b/ChemistryLib/PhreeqcIOData/CreateOutput.cpp
@@ -8,12 +8,13 @@
  *
  */
 
+#include "CreateOutput.h"
+
 #include <algorithm>
 #include <numeric>
 
 #include "AqueousSolution.h"
 #include "ChemicalSystem.h"
-#include "CreateOutput.h"
 #include "KineticReactant.h"
 #include "UserPunch.h"
 
diff --git a/ChemistryLib/PhreeqcIOData/CreateSolutionComponent.cpp b/ChemistryLib/PhreeqcIOData/CreateSolutionComponent.cpp
index 6a0c67fdcc088a709bec65b7a73c8dff67d688ab..eb57be82916abd3e071c24c1be754ec29f557e52 100644
--- a/ChemistryLib/PhreeqcIOData/CreateSolutionComponent.cpp
+++ b/ChemistryLib/PhreeqcIOData/CreateSolutionComponent.cpp
@@ -9,6 +9,7 @@
  */
 
 #include "CreateSolutionComponent.h"
+
 #include "AqueousSolution.h"
 #include "BaseLib/ConfigTree.h"
 
diff --git a/ChemistryLib/PhreeqcIOData/Dump.cpp b/ChemistryLib/PhreeqcIOData/Dump.cpp
index 87181623b9f78a7ba75af239cb869936aa074dea..b950113563ed4931e9d052a7890463453f1a5d74 100644
--- a/ChemistryLib/PhreeqcIOData/Dump.cpp
+++ b/ChemistryLib/PhreeqcIOData/Dump.cpp
@@ -8,21 +8,24 @@
  *
  */
 
-#include <iostream>
-
 #include "Dump.h"
 
+#include <iostream>
+
 namespace ChemistryLib
 {
 namespace PhreeqcIOData
 {
 void Dump::print(std::ostream& os, std::size_t const num_chemical_systems) const
 {
-    os << "DUMP" << "\n";
+    os << "DUMP"
+       << "\n";
     os << "-file " << dump_file << "\n";
-    os << "-append false" << "\n";
+    os << "-append false"
+       << "\n";
     os << "-solution 1-" << num_chemical_systems << "\n";
-    os << "END" << "\n";
+    os << "END"
+       << "\n";
 }
 
 void Dump::readDumpFile(std::istream& in,
diff --git a/ChemistryLib/PhreeqcIOData/EquilibriumReactant.cpp b/ChemistryLib/PhreeqcIOData/EquilibriumReactant.cpp
index e48e452afc1b017c67cb12d58ac564c24defcb3e..185403dc8a2297ba970e77dac00907070fe94eb9 100644
--- a/ChemistryLib/PhreeqcIOData/EquilibriumReactant.cpp
+++ b/ChemistryLib/PhreeqcIOData/EquilibriumReactant.cpp
@@ -8,10 +8,10 @@
  *
  */
 
-#include <ostream>
-
 #include "EquilibriumReactant.h"
 
+#include <ostream>
+
 namespace ChemistryLib
 {
 namespace PhreeqcIOData
diff --git a/ChemistryLib/PhreeqcIOData/KineticReactant.cpp b/ChemistryLib/PhreeqcIOData/KineticReactant.cpp
index 173635e2ebcdc11c343e1f6b1a2180aff34b9367..7c1d5288b555ba23320cacb0c1fac48fb4d5eb0e 100644
--- a/ChemistryLib/PhreeqcIOData/KineticReactant.cpp
+++ b/ChemistryLib/PhreeqcIOData/KineticReactant.cpp
@@ -8,10 +8,10 @@
  *
  */
 
-#include <ostream>
-
 #include "KineticReactant.h"
 
+#include <ostream>
+
 namespace ChemistryLib
 {
 namespace PhreeqcIOData
diff --git a/ChemistryLib/PhreeqcIOData/Knobs.cpp b/ChemistryLib/PhreeqcIOData/Knobs.cpp
index c717452ea312f0e6bcc3f88e63219113eedc0a84..66230d2ba6b63827180b0e8520131472ddfa8c33 100644
--- a/ChemistryLib/PhreeqcIOData/Knobs.cpp
+++ b/ChemistryLib/PhreeqcIOData/Knobs.cpp
@@ -8,17 +8,18 @@
  *
  */
 
-#include <ostream>
-
 #include "Knobs.h"
 
+#include <ostream>
+
 namespace ChemistryLib
 {
 namespace PhreeqcIOData
 {
 std::ostream& operator<<(std::ostream& os, Knobs const& knobs)
 {
-    os << "KNOBS" << "\n";
+    os << "KNOBS"
+       << "\n";
     os << "-iterations " << knobs.max_iterations << "\n";
     os << "-convergence_tolerance " << knobs.relative_convergence_tolerance
        << "\n";
diff --git a/ChemistryLib/PhreeqcIOData/Output.cpp b/ChemistryLib/PhreeqcIOData/Output.cpp
index 2b68617d76fae7d853fc148392d0a46bfdcab8c1..522ab2352556af5b9b20df54b597a0c657d6388b 100644
--- a/ChemistryLib/PhreeqcIOData/Output.cpp
+++ b/ChemistryLib/PhreeqcIOData/Output.cpp
@@ -8,10 +8,10 @@
  *
  */
 
-#include <ostream>
-
 #include "Output.h"
 
+#include <ostream>
+
 namespace ChemistryLib
 {
 namespace PhreeqcIOData
@@ -19,7 +19,8 @@ namespace PhreeqcIOData
 std::ostream& operator<<(std::ostream& os,
                          BasicOutputSetups const& basic_output_setups)
 {
-    os << "SELECTED_OUTPUT" << "\n";
+    os << "SELECTED_OUTPUT"
+       << "\n";
     os << "-file " << basic_output_setups.output_file << "\n";
     os << "-high_precision " << std::boolalpha
        << basic_output_setups.use_high_precision << "\n";
diff --git a/ChemistryLib/PhreeqcIOData/ReactionRate.cpp b/ChemistryLib/PhreeqcIOData/ReactionRate.cpp
index 91b786fc3d493c93681957b7e43c10867460f418..386840ff039b883c2f0858e0f06e59f1e15955e0 100644
--- a/ChemistryLib/PhreeqcIOData/ReactionRate.cpp
+++ b/ChemistryLib/PhreeqcIOData/ReactionRate.cpp
@@ -8,10 +8,10 @@
  *
  */
 
-#include <ostream>
-
 #include "ReactionRate.h"
 
+#include <ostream>
+
 namespace ChemistryLib
 {
 namespace PhreeqcIOData
@@ -19,14 +19,16 @@ namespace PhreeqcIOData
 std::ostream& operator<<(std::ostream& os, ReactionRate const& reaction_rate)
 {
     os << reaction_rate.kinetic_reactant << "\n";
-    os << "-start" << "\n";
+    os << "-start"
+       << "\n";
     int line_number = 1;
     for (auto const& expression_statement : reaction_rate.expression_statements)
     {
         os << line_number << " " << expression_statement << "\n";
         ++line_number;
     }
-    os << "-end" << "\n";
+    os << "-end"
+       << "\n";
 
     return os;
 }
diff --git a/ChemistryLib/PhreeqcIOData/Surface.cpp b/ChemistryLib/PhreeqcIOData/Surface.cpp
index f7466b5b0b38d96b760181fcf083b0c9d347f20f..53fbafc54beebdd4be65db7bfc49b74eecd8da74 100644
--- a/ChemistryLib/PhreeqcIOData/Surface.cpp
+++ b/ChemistryLib/PhreeqcIOData/Surface.cpp
@@ -8,10 +8,10 @@
  *
  */
 
-#include <ostream>
-
 #include "Surface.h"
 
+#include <ostream>
+
 namespace ChemistryLib
 {
 namespace PhreeqcIOData
diff --git a/ChemistryLib/PhreeqcIOData/UserPunch.cpp b/ChemistryLib/PhreeqcIOData/UserPunch.cpp
index 0475d4327e5e49aff1e046bd86fe5477f1bb30ed..a42c56b6123047ace66b66e94ad50039785c53f4 100644
--- a/ChemistryLib/PhreeqcIOData/UserPunch.cpp
+++ b/ChemistryLib/PhreeqcIOData/UserPunch.cpp
@@ -9,6 +9,7 @@
  */
 
 #include "UserPunch.h"
+
 #include "BaseLib/ConfigTreeUtil.h"
 
 namespace ChemistryLib
@@ -25,7 +26,8 @@ void UserPunch::initialize(std::size_t const num_chemical_systems)
 
 std::ostream& operator<<(std::ostream& os, UserPunch const& user_punch)
 {
-    os << "USER_PUNCH" << "\n";
+    os << "USER_PUNCH"
+       << "\n";
     os << "-headings ";
     auto const& secondary_variables = user_punch.secondary_variables;
     for (auto& secondary_variable : secondary_variables)
@@ -34,14 +36,16 @@ std::ostream& operator<<(std::ostream& os, UserPunch const& user_punch)
     }
     os << "\n";
 
-    os << "-start" << "\n";
+    os << "-start"
+       << "\n";
     int line_number = 1;
     for (auto const& statement : user_punch.statements)
     {
         os << line_number << " " << statement << "\n";
         ++line_number;
     }
-    os << "-end" << "\n";
+    os << "-end"
+       << "\n";
 
     return os;
 }
diff --git a/ChemistryLib/PhreeqcKernelData/CreateInitialAqueousSolution.cpp b/ChemistryLib/PhreeqcKernelData/CreateInitialAqueousSolution.cpp
index 1ea75b05eaa5fa14ec5a4ddf5145d3371d51a933..deef103cbc2899a7a7b7fbd94170da330a391695 100644
--- a/ChemistryLib/PhreeqcKernelData/CreateInitialAqueousSolution.cpp
+++ b/ChemistryLib/PhreeqcKernelData/CreateInitialAqueousSolution.cpp
@@ -9,6 +9,7 @@
  */
 
 #include "CreateInitialAqueousSolution.h"
+
 #include "BaseLib/ConfigTree.h"
 #include "BaseLib/Error.h"
 #include "ChemistryLib/Common/ChargeBalance.h"
diff --git a/ChemistryLib/PhreeqcKernelData/KineticReactant.cpp b/ChemistryLib/PhreeqcKernelData/KineticReactant.cpp
index ec835592f044b5065e266931a4d3e56f982f9697..64a42fe208fc6e435ed599630f2a4a1d3dea593c 100644
--- a/ChemistryLib/PhreeqcKernelData/KineticReactant.cpp
+++ b/ChemistryLib/PhreeqcKernelData/KineticReactant.cpp
@@ -8,10 +8,10 @@
  *
  */
 
-#include <algorithm>
-
 #include "KineticReactant.h"
 
+#include <algorithm>
+
 namespace ChemistryLib
 {
 namespace PhreeqcKernelData
diff --git a/ChemistryLib/PhreeqcKernelData/ReactionRate.cpp b/ChemistryLib/PhreeqcKernelData/ReactionRate.cpp
index 8be0544682e3adc3d922c0214363badddd9db978..fd2f055eb5e2aa3192cb0a5270e3d609e0a4807e 100644
--- a/ChemistryLib/PhreeqcKernelData/ReactionRate.cpp
+++ b/ChemistryLib/PhreeqcKernelData/ReactionRate.cpp
@@ -14,8 +14,8 @@ namespace ChemistryLib
 {
 namespace PhreeqcKernelData
 {
-ReactionRate::ReactionRate(std::string kinetic_reactant_,
-                           std::vector<std::string> statements)
+ReactionRate::ReactionRate(
+    std::string kinetic_reactant_, std::vector<std::string> statements)
     : kinetic_reactant(std::move(kinetic_reactant_))
 {
     int line_number = 1;