diff --git a/corsika/detail/media/NuclearComposition.inl b/corsika/detail/media/NuclearComposition.inl
index 37d8da57d6cd0a21696c8d0c2748e0b916fd163c..4995799d58ba35e30c09448946d67c50f8e29ade 100644
--- a/corsika/detail/media/NuclearComposition.inl
+++ b/corsika/detail/media/NuclearComposition.inl
@@ -97,7 +97,7 @@ namespace corsika {
     return components_[iChannel];
   }
 
-  // Note: when this class ever modifies its internal data, the hash 
+  // Note: when this class ever modifies its internal data, the hash
   // must be updated, too!
   inline size_t NuclearComposition::getHash() const { return hash_; }
 
diff --git a/corsika/media/NuclearComposition.hpp b/corsika/media/NuclearComposition.hpp
index 9e435adf60d2b6c1325ac65df56005e875142d37..e4ad9513a24684eed2ca1c3b9862441003f2c0fa 100644
--- a/corsika/media/NuclearComposition.hpp
+++ b/corsika/media/NuclearComposition.hpp
@@ -63,7 +63,7 @@ namespace corsika {
     Code sampleTarget(std::vector<CrossSectionType> const& sigma,
                       TRNG& randomStream) const;
 
-    // Note: when this class ever modifies its internal data, the hash 
+    // Note: when this class ever modifies its internal data, the hash
     // must be updated, too!
     size_t getHash() const;
 
diff --git a/tests/media/testEnvironment.cpp b/tests/media/testEnvironment.cpp
index 27f99a61f6179902e0e45606ace1d1f44939722d..3eab2cd6b9e5cdce3efc87ae48a9281145fbcb72 100644
--- a/tests/media/testEnvironment.cpp
+++ b/tests/media/testEnvironment.cpp
@@ -220,7 +220,7 @@ TEST_CASE("InhomogeneousMedium") {
     CHECK(rho.getArclengthFromGrammage(trajectory, 20_g / (1_cm * 1_cm)) ==
           inhMedium.getArclengthFromGrammage(trajectory, 20_g / (1_cm * 1_cm)));
     CHECK(inhMedium.getNuclearComposition() == composition);
-    CHECK(inhMedium.getMassDensity({gCS, {0_m, 0_m, 0_m}}) == 1_kg/static_pow<3>(1_m));
+    CHECK(inhMedium.getMassDensity({gCS, {0_m, 0_m, 0_m}}) == 1_kg / static_pow<3>(1_m));
   }
 }
 
@@ -240,7 +240,7 @@ TEST_CASE("LayeredSphericalAtmosphereBuilder") {
   builder.addExponentialLayer(540.1778_g / (1_cm * 1_cm), 772170.16_cm, 30_km);
 
   CHECK_THROWS(builder.addLinearLayer(0.5_km, 5_km));
-  
+
   CHECK(builder.getSize() == 3);
 
   auto const builtEnv = builder.assemble();
@@ -307,7 +307,7 @@ TEST_CASE("LayeredSphericalAtmosphereBuilder w/ magnetic field") {
                                      ->getModelProperties()
                                      .getMagneticField(pTest2)
                                      .getComponents(gCS));
- }
+}
 
 TEST_CASE("media", "LayeredSphericalAtmosphereBuilder USStd") {
   // setup environment, geometry
diff --git a/tests/media/testShowerAxis.cpp b/tests/media/testShowerAxis.cpp
index bd21f6805768604fd4dbbfc3d59ec3b48eb0631c..19d7635aedebd4ff901396af86cc4651ba94b3e2 100644
--- a/tests/media/testShowerAxis.cpp
+++ b/tests/media/testShowerAxis.cpp
@@ -63,7 +63,7 @@ TEST_CASE("Homogeneous Density") {
 
   ShowerAxis const showerAxis{injectionPos, (showerCore - injectionPos), *env,
                               true, // -> do not throw exceptions
-                              20};   // -> number of bins
+                              20};  // -> number of bins
 
   CHECK(showerAxis.getSteplength() == 500_m);
 
@@ -82,5 +82,5 @@ TEST_CASE("Homogeneous Density") {
   CHECK(showerAxis.getStart().getCoordinates() == injectionPos.getCoordinates());
 
   CHECK_THROWS(showerAxis.getX(-1_m));
-  CHECK_THROWS(showerAxis.getX((injectionPos-showerCore).getNorm()+1_m));
+  CHECK_THROWS(showerAxis.getX((injectionPos - showerCore).getNorm() + 1_m));
 }