diff --git a/Environment/MediumProperties.h b/Environment/MediumProperties.h
index 4e3d433d0ab8961f27a8346cbfc0098d49e42dec..969f34c0c51734e96e75a1c8a218269789b3afdc 100644
--- a/Environment/MediumProperties.h
+++ b/Environment/MediumProperties.h
@@ -17,10 +17,19 @@ namespace corsika::environment {
    * components.
    **/
 
-  enum class MediumType { Unknown, Element, RadioactiveElement, InorganicCompound, OrganicCompound, Polymer, Mixture, BiologicalDosimetry };
+  enum class MediumType {
+    Unknown,
+    Element,
+    RadioactiveElement,
+    InorganicCompound,
+    OrganicCompound,
+    Polymer,
+    Mixture,
+    BiologicalDosimetry
+  };
 
   enum class State { Unknown, Solid, Liquid, Gas, DiatomicGas };
-  
+
   enum class Medium : int16_t;
   using MediumIntType = std::underlying_type<Medium>::type;
 
@@ -51,8 +60,8 @@ namespace corsika::environment {
     double dlt0_;
 
     std::string name() const { return name_; }
-    std::string pretty_name() const {return pretty_name_; }
-    double weight() const {return weight_; }
+    std::string pretty_name() const { return pretty_name_; }
+    double weight() const { return weight_; }
     int weight_significant_figure() const { return weight_significant_figure_; }
     int weight_error_last_digit() const { return weight_error_last_digit_; }
     double Z_over_A() const { return Z_over_A_; }
@@ -72,14 +81,12 @@ namespace corsika::environment {
 
 } // namespace corsika::environment
 
-
 #include <corsika/environment/GeneratedMediaProperties.inc>
 
-
 namespace corsika::environment {
 
   constexpr MediumData const& mediumData(Medium const m) {
     return detail::medium_data[static_cast<MediumIntType>(m)];
   }
-  
+
 } // namespace corsika::environment
diff --git a/Environment/MediumPropertyModel.h b/Environment/MediumPropertyModel.h
index ca5bcb51c3d9d45d62a27da7df151a7968c3dd0a..bf05be4dcae04c5d56f1291e1e8caa886480a82b 100644
--- a/Environment/MediumPropertyModel.h
+++ b/Environment/MediumPropertyModel.h
@@ -48,10 +48,7 @@ namespace corsika::environment {
       return medium_;
     }
 
-    void set_medium(Medium v) {
-      medium_ = v;
-    }
-
+    void set_medium(Medium v) { medium_ = v; }
 
   }; // END: class MediumPropertyModel
 
diff --git a/Environment/testEnvironment.cc b/Environment/testEnvironment.cc
index 4d478b9b2dc7e00ea60f6b3d3f6f9a012cbc8ae2..5373670a0a7d8ed33a16b88d4daf7ec277823472 100644
--- a/Environment/testEnvironment.cc
+++ b/Environment/testEnvironment.cc
@@ -16,10 +16,10 @@
 #include <corsika/environment/InhomogeneousMedium.h>
 #include <corsika/environment/LayeredSphericalAtmosphereBuilder.h>
 #include <corsika/environment/LinearApproximationIntegrator.h>
+#include <corsika/environment/MediumPropertyModel.h>
 #include <corsika/environment/NuclearComposition.h>
 #include <corsika/environment/SlidingPlanarExponential.h>
 #include <corsika/environment/UniformMagneticField.h>
-#include <corsika/environment/MediumPropertyModel.h>
 #include <corsika/environment/UniformRefractiveIndex.h>
 #include <corsika/environment/VolumeTreeNode.h>
 #include <corsika/geometry/Line.h>
@@ -399,20 +399,18 @@ TEST_CASE("UniformRefractiveIndex w/ Homogeneous") {
   CHECK((medium.ArclengthFromGrammage(trajectory, density * 5_m) / 5_m) == Approx(1));
 }
 
-
 TEST_CASE("MediumProperties") {
 
   // test access of medium properties via enum and class types
-  
+
   const Medium type = Medium::AirDry1Atm;
   const MediumData& air = mediumData(type);
-  CHECK(air.Ieff() ==  85.7 );
-  CHECK(air.Cbar() ==  10.5961 );
-  CHECK(air.x0() ==  1.7418 );
-  CHECK(air.x1() ==  4.2759 );
-  CHECK(air.sk() ==  3.3994 );
-  CHECK(air.dlt0() ==  0.0 );
-
+  CHECK(air.Ieff() == 85.7);
+  CHECK(air.Cbar() == 10.5961);
+  CHECK(air.x0() == 1.7418);
+  CHECK(air.x1() == 4.2759);
+  CHECK(air.sk() == 3.3994);
+  CHECK(air.dlt0() == 0.0);
 }
 
 TEST_CASE("MediumPropertyModel w/ Homogeneous") {
diff --git a/Framework/Utilities/SaveBoostHistogram.hpp b/Framework/Utilities/SaveBoostHistogram.hpp
index 55bf482926c988cb561ada322dc56a67f3842649..c6ffbe064df6b0d707a37177bb1d811d40534ffa 100644
--- a/Framework/Utilities/SaveBoostHistogram.hpp
+++ b/Framework/Utilities/SaveBoostHistogram.hpp
@@ -41,7 +41,7 @@ namespace corsika::utl {
     std::vector<char> axis_types;
     axis_types.reserve(rank);
 
-    for (int i = 0; i < rank; ++i) {
+    for (unsigned int i = 0; i < rank; ++i) {
       auto const& ax = h.axis(i);
       unsigned const has_underflow = (ax.options() & 0x01) ? 1 : 0;
       unsigned const has_overflow = (ax.options() & 0x02) ? 1 : 0;
diff --git a/Processes/CONEXSourceCut/testCONEXSourceCut.cc b/Processes/CONEXSourceCut/testCONEXSourceCut.cc
index a29ea3d325285c36b8a34122ff62843cf2bad334..dabed2edffc1b5924acc572e8d2b5d6b64ad8cde 100644
--- a/Processes/CONEXSourceCut/testCONEXSourceCut.cc
+++ b/Processes/CONEXSourceCut/testCONEXSourceCut.cc
@@ -10,8 +10,8 @@
 
 #include <corsika/environment/Environment.h>
 #include <corsika/environment/LayeredSphericalAtmosphereBuilder.h>
-#include <corsika/environment/UniformMagneticField.h>
 #include <corsika/environment/MediumPropertyModel.h>
+#include <corsika/environment/UniformMagneticField.h>
 
 #include <corsika/geometry/Point.h>
 #include <corsika/geometry/RootCoordinateSystem.h>
diff --git a/Setup/SetupEnvironment.h b/Setup/SetupEnvironment.h
index 239a0105b5d0af18da01e5a73a5bab64683bfbbf..f4265e3ddf7342b2972e6317a14bbf946c664ff1 100644
--- a/Setup/SetupEnvironment.h
+++ b/Setup/SetupEnvironment.h
@@ -30,8 +30,8 @@ namespace corsika::setup {
 
 #include <corsika/environment/HomogeneousMedium.h>
 #include <corsika/environment/InhomogeneousMedium.h>
-#include <corsika/environment/UniformMagneticField.h>
 #include <corsika/environment/MediumPropertyModel.h>
+#include <corsika/environment/UniformMagneticField.h>
 
 /**
  * standard environment for unit testing. This can be moved to
@@ -59,7 +59,7 @@ namespace corsika::setup::testing {
      * construct suited environment medium model:
      */
     using MyHomogeneousModel =
-      environment::MediumPropertyModel<environment::UniformMagneticField<
+        environment::MediumPropertyModel<environment::UniformMagneticField<
             environment::HomogeneousMedium<setup::EnvironmentInterface>>>;
 
     world->SetModelProperties<MyHomogeneousModel>(