diff --git a/Framework/Cascade/testCascade.cc b/Framework/Cascade/testCascade.cc
index ad4daa2e4df0a554727f1a0584cc88a3af3cff72..6d0244555d7c9e66de6121e4f3d2a2e31bb4dda3 100644
--- a/Framework/Cascade/testCascade.cc
+++ b/Framework/Cascade/testCascade.cc
@@ -73,7 +73,6 @@ public:
 private:
 };
 
-
 TEST_CASE("Cascade", "[Cascade]") {
 
   tracking_line::TrackingLine<setup::Stack> tracking;
@@ -92,8 +91,8 @@ TEST_CASE("Cascade", "[Cascade]") {
   EnergyType E0 = 100_GeV;
   particle.SetEnergy(E0);
   particle.SetPosition(Point(rootCS, {0_m, 0_m, 10_km}));
-  particle.SetMomentum(
-		       corsika::stack::super_stupid::MomentumVector(rootCS, {0*newton*second, 0*newton*second, -1*newton*second}));
+  particle.SetMomentum(corsika::stack::super_stupid::MomentumVector(
+      rootCS, {0 * newton * second, 0 * newton * second, -1 * newton * second}));
   EAS.Init();
   EAS.Run();
 
diff --git a/Framework/Particles/ParticleProperties.h b/Framework/Particles/ParticleProperties.h
index d4edb3f63c62759c6f9d5ab95b0fa0cf9deeaa99..e7d48547f87779c8da84ea2c318de55ee8b163a8 100644
--- a/Framework/Particles/ParticleProperties.h
+++ b/Framework/Particles/ParticleProperties.h
@@ -26,7 +26,6 @@
 #include <corsika/units/PhysicalConstants.h>
 #include <corsika/units/PhysicalUnits.h>
 
-
 /**
  * @namespace particle
  *
diff --git a/Framework/Particles/testParticles.cc b/Framework/Particles/testParticles.cc
index 59d9938260ca124cc5c760fc6dd0716c0ad627f5..78f34d0beb262166e51839bbedf3b83521355d6a 100644
--- a/Framework/Particles/testParticles.cc
+++ b/Framework/Particles/testParticles.cc
@@ -55,10 +55,14 @@ TEST_CASE("ParticleProperties", "[Particles]") {
   }
 
   SECTION("Lifetimes") {
-    REQUIRE(GetLifetime(Code::Electron) == std::numeric_limits<double>::infinity() * corsika::units::si::second);
-    REQUIRE(GetLifetime(Code::DPlus) <  GetLifetime(Code::Gamma));
-    //REQUIRE(GetLifetime(Code::RhoPlus)/corsika::units::si::second == (Approx(4.414566727909413e-24).epsilon(1e-3)));
-    //REQUIRE(GetLifetime(Code::SigmaMinusBar)/corsika::units::si::second == (Approx(8.018880848563575e-11).epsilon(1e-5)));
-    //REQUIRE(GetLifetime(Code::MuPlus)/corsika::units::si::second == (Approx(2.1970332555864364e-06).epsilon(1e-5)));
+    REQUIRE(GetLifetime(Code::Electron) ==
+            std::numeric_limits<double>::infinity() * corsika::units::si::second);
+    REQUIRE(GetLifetime(Code::DPlus) < GetLifetime(Code::Gamma));
+    // REQUIRE(GetLifetime(Code::RhoPlus)/corsika::units::si::second ==
+    // (Approx(4.414566727909413e-24).epsilon(1e-3)));
+    // REQUIRE(GetLifetime(Code::SigmaMinusBar)/corsika::units::si::second ==
+    // (Approx(8.018880848563575e-11).epsilon(1e-5)));
+    // REQUIRE(GetLifetime(Code::MuPlus)/corsika::units::si::second ==
+    // (Approx(2.1970332555864364e-06).epsilon(1e-5)));
   }
 }
diff --git a/Framework/Units/PhysicalUnits.h b/Framework/Units/PhysicalUnits.h
index f2c1b8213d511ab00054ef52eeb796e71643670e..8975a6e9994cb316cf4c633c3ba6a0715c1d90c0 100644
--- a/Framework/Units/PhysicalUnits.h
+++ b/Framework/Units/PhysicalUnits.h
@@ -10,23 +10,22 @@
  * @file PhysicalUnits
  *
  * Add new units and types we need
- * 
+ *
  * Define _XeV literals, etc., allowing 10_GeV in the code.
  */
 
 namespace corsika::units::hep {
   using namespace phys::units;
   using namespace phys::units::literals;
-  
+
   /// defining HEP energy, mass, momentum
   using energy_hep_d = phys::units::energy_d;
-  
+
   using MassType = phys::units::quantity<energy_hep_d, double>;
   using MomentumType = phys::units::quantity<energy_hep_d, double>;
   using EnergyType = phys::units::quantity<energy_hep_d, double>;
 
-} // end namespace corsika::units::si
-
+} // namespace corsika::units::hep
 
 namespace corsika::units::si {
   using namespace phys::units;
@@ -75,7 +74,6 @@ namespace phys {
       QUANTITY_DEFINE_SCALING_LITERALS(barn, corsika::units::si::sigma_d,
                                        magnitude(corsika::units::si::constants::barn))
 
-
       QUANTITY_DEFINE_SCALING_LITERALS(meter, length_d,
                                        magnitude(corsika::units::si::constants::meter))
 
diff --git a/Framework/Units/testUnits.cc b/Framework/Units/testUnits.cc
index 9124431862b6d0215d44306403b2f31457d1ccda..4990cd62462af914744aefe76be86528333a978e 100644
--- a/Framework/Units/testUnits.cc
+++ b/Framework/Units/testUnits.cc
@@ -92,19 +92,17 @@ TEST_CASE("PhysicalUnits", "[Units]") {
     REQUIRE(E3 == 180_GeV);
   }
 
-
   SECTION("Unit system conversion") {
-    
-    const units::hep::MassType m_hep = 3_GeV; 
-    
+
+    const units::hep::MassType m_hep = 3_GeV;
+
     REQUIRE(m_hep == 3_GeV); // hep::mass identical to si::energy
     auto type_check = m_hep / units::si::constants::cSquared;
     REQUIRE(dynamic_cast<units::si::MassType*>(&type_check)); // hep::mass*c2 is mass unit
 
     const units::hep::EnergyType e_hep = 4_GeV;
 
-    REQUIRE(sqrt(m_hep*m_hep + e_hep*e_hep) == 5_GeV);
-
+    REQUIRE(sqrt(m_hep * m_hep + e_hep * e_hep) == 5_GeV);
   }
 
   SECTION("Special") {
@@ -113,5 +111,4 @@ TEST_CASE("PhysicalUnits", "[Units]") {
     REQUIRE(farAway > 100000_m);
     REQUIRE_FALSE(farAway < 1e19 * meter);
   }
-
 }
diff --git a/Processes/StackInspector/StackInspector.h b/Processes/StackInspector/StackInspector.h
index e40517499d7c07b984c5d9b30caac469269cf649..7b68d92d3fa6f5527de8bc42b76059017a79221f 100644
--- a/Processes/StackInspector/StackInspector.h
+++ b/Processes/StackInspector/StackInspector.h
@@ -16,7 +16,6 @@
 
 #include <corsika/setup/SetupTrajectory.h>
 
-
 namespace corsika::process {
 
   namespace stack_inspector {
diff --git a/Processes/TrackingLine/TrackingLine.h b/Processes/TrackingLine/TrackingLine.h
index 602d5473269c8e15561967fe9adc8b16ff4dfa0c..e750342a1add1bff5e32bd270710e995d60ce4b0 100644
--- a/Processes/TrackingLine/TrackingLine.h
+++ b/Processes/TrackingLine/TrackingLine.h
@@ -1,8 +1,8 @@
 #ifndef _include_corsika_processes_TrackinLine_h_
 #define _include_corsika_processes_TrackinLine_h_
 
-#include <corsika/geometry/Vector.h>
 #include <corsika/geometry/Point.h>
+#include <corsika/geometry/Vector.h>
 
 #include <corsika/units/PhysicalUnits.h>
 
@@ -28,7 +28,7 @@ namespace corsika::process {
       }
     };
 
-  } // namespace stack_inspector
+  } // namespace tracking_line
 
 } // namespace corsika::process