diff --git a/Documentation/Examples/vertical_EAS.cc b/Documentation/Examples/vertical_EAS.cc
index 7c70e69977bf3c073d5e5dc96db1d42910834f47..563e802cc8929c4b3f03ab7049ead50774fc0af5 100644
--- a/Documentation/Examples/vertical_EAS.cc
+++ b/Documentation/Examples/vertical_EAS.cc
@@ -22,8 +22,8 @@
 #include <corsika/process/interaction_counter/InteractionCounter.h>
 #include <corsika/process/longitudinal_profile/LongitudinalProfile.h>
 #include <corsika/process/observation_plane/ObservationPlane.h>
-#include <corsika/process/particle_cut/ParticleCut.h>
 #include <corsika/process/on_shell_check/OnShellCheck.h>
+#include <corsika/process/particle_cut/ParticleCut.h>
 #include <corsika/process/pythia/Decay.h>
 #include <corsika/process/sibyll/Decay.h>
 #include <corsika/process/sibyll/Interaction.h>
diff --git a/Processes/OnShellCheck/OnShellCheck.cc b/Processes/OnShellCheck/OnShellCheck.cc
index 55a389421b8b9ac13b3557bd7095d9782e59ea1b..beee3a70ef4c55ad6e966c70f6c06d92e4dd0b23 100644
--- a/Processes/OnShellCheck/OnShellCheck.cc
+++ b/Processes/OnShellCheck/OnShellCheck.cc
@@ -9,8 +9,8 @@
  * the license.
  */
 
-#include <corsika/process/on_shell_check/OnShellCheck.h>
 #include <corsika/geometry/FourVector.h>
+#include <corsika/process/on_shell_check/OnShellCheck.h>
 
 using namespace std;
 
@@ -23,7 +23,7 @@ using namespace corsika::setup;
 namespace corsika::process {
   namespace on_shell_check {
 
-    void OnShellCheck::Init(){
+    void OnShellCheck::Init() {
       std::cout << "OnShellCheck: mass tolerance is set to " << mass_tolerance_ * 100
                 << "%" << endl
                 << "              energy tolerance is set to " << energy_tolerance_ * 100
@@ -33,8 +33,9 @@ namespace corsika::process {
     EProcessReturn OnShellCheck::DoSecondaries(corsika::setup::StackView& vS) {
       for (auto& p : vS) {
         auto const pid = p.GetPID();
-	//if(pid==particles::Code::Gamma || particles::IsNeutrino(pid) || particles::IsNucleus(pid)) continue;
-	if(!particles::IsHadron(pid)) continue;
+        // if(pid==particles::Code::Gamma || particles::IsNeutrino(pid) ||
+        // particles::IsNucleus(pid)) continue;
+        if (!particles::IsHadron(pid)) continue;
         auto const e_original = p.GetEnergy();
         auto const p_original = p.GetMomentum();
         auto const Plab = corsika::geometry::FourVector(e_original, p_original);
@@ -45,24 +46,24 @@ namespace corsika::process {
           const HEPEnergyType e_shifted =
               sqrt(p_original.GetSquaredNorm() + m_corsika * m_corsika);
           auto const e_shift_relative = (e_shifted / e_original - 1);
-	  /* 
-	     For now we warn if the necessary shift is larger than 1%.
-	     we could promote this to an error.
-	   */
-	  if (abs(e_shift_relative) > energy_tolerance_) {
-	    std::cout << "OnShellCheck: warning! shifted particle energy by "
-		      << e_shift_relative*100 << " %" << std::endl;	    
-	  }
-          std::cout << "OnShellCheck: shift particle mass for " << pid
-                    << std::endl
+          /*
+             For now we warn if the necessary shift is larger than 1%.
+             we could promote this to an error.
+           */
+          if (abs(e_shift_relative) > energy_tolerance_) {
+            std::cout << "OnShellCheck: warning! shifted particle energy by "
+                      << e_shift_relative * 100 << " %" << std::endl;
+          }
+          std::cout << "OnShellCheck: shift particle mass for " << pid << std::endl
                     << std::setw(35) << std::setfill(' ')
                     << "corsika mass (GeV): " << m_corsika / 1_GeV << std::endl
-		    << std::setw(35) << std::setfill(' ')
+                    << std::setw(35) << std::setfill(' ')
                     << "kinetic mass (GeV): " << m_kinetic / 1_GeV << std::endl
-		    << std::setw(35) << std::setfill(' ')
+                    << std::setw(35) << std::setfill(' ')
                     << "m_kin-m_cor (GeV): " << m_err_abs / 1_GeV << std::endl
-		    << std::setw(35) << std::setfill(' ')
-                    << "mass tolerance (GeV): " << ( m_corsika * mass_tolerance_ ) / 1_GeV << std::endl;
+                    << std::setw(35) << std::setfill(' ')
+                    << "mass tolerance (GeV): " << (m_corsika * mass_tolerance_) / 1_GeV
+                    << std::endl;
           // reset energy
           p.SetEnergy(e_shifted);
         } else
@@ -70,5 +71,5 @@ namespace corsika::process {
       }
       return EProcessReturn::eOk;
     }
-  }
-} // namespace on_shell_check
+  } // namespace on_shell_check
+} // namespace corsika::process
diff --git a/Processes/OnShellCheck/testOnShellCheck.cc b/Processes/OnShellCheck/testOnShellCheck.cc
index 62539e36aef6cadd1999d61278020cb50947d2f1..bfe938305c3bdc1921a981bc9016c436eeeda572 100644
--- a/Processes/OnShellCheck/testOnShellCheck.cc
+++ b/Processes/OnShellCheck/testOnShellCheck.cc
@@ -11,10 +11,10 @@
 #include <corsika/process/on_shell_check/OnShellCheck.h>
 
 #include <corsika/environment/Environment.h>
+#include <corsika/geometry/FourVector.h>
 #include <corsika/geometry/Point.h>
 #include <corsika/geometry/RootCoordinateSystem.h>
 #include <corsika/geometry/Vector.h>
-#include <corsika/geometry/FourVector.h>
 #include <corsika/units/PhysicalUnits.h>
 #include <corsika/utl/CorsikaFenv.h>
 
@@ -39,8 +39,8 @@ TEST_CASE("OnShellCheck", "[processes]") {
   // two energies
   const HEPEnergyType E = 10_GeV;
   // list of arbitrary particles
-  std::array<particles::Code, 2> particleList = {
-      particles::Code::PiPlus,   particles::Code::PiMinus};
+  std::array<particles::Code, 2> particleList = {particles::Code::PiPlus,
+                                                 particles::Code::PiMinus};
 
   std::array<double, 2> mass_shifts = {1.1, 1.001};
 
@@ -49,7 +49,7 @@ TEST_CASE("OnShellCheck", "[processes]") {
     OnShellCheck check(1.e-2, 0.01);
 
     check.Init();
-    
+
     // add primary particle to stack
     auto particle = stack.AddParticle(
         std::tuple<particles::Code, units::si::HEPEnergyType,
@@ -67,24 +67,24 @@ TEST_CASE("OnShellCheck", "[processes]") {
     int count = -1;
     for (auto proType : particleList) {
       count++;
-      const auto pz = sqrt((E - particles::GetMass(proType)*mass_shifts[count]) *
-                           (E + particles::GetMass(proType)*mass_shifts[count]));
+      const auto pz = sqrt((E - particles::GetMass(proType) * mass_shifts[count]) *
+                           (E + particles::GetMass(proType) * mass_shifts[count]));
       auto const momentum = corsika::stack::MomentumVector(rootCS, {0_GeV, 0_GeV, pz});
       projectile.AddSecondary(std::tuple<particles::Code, units::si::HEPEnergyType,
                                          corsika::stack::MomentumVector, geometry::Point,
                                          units::si::TimeType>{
-          proType, E, momentum, geometry::Point(rootCS, 0_m, 0_m, 0_m), 0_ns});      
+          proType, E, momentum, geometry::Point(rootCS, 0_m, 0_m, 0_m), 0_ns});
     }
     check.DoSecondaries(view);
     int i = -1;
-    for ( auto& p : view) {
+    for (auto& p : view) {
       i++;
       auto const Plab = corsika::geometry::FourVector(p.GetEnergy(), p.GetMomentum());
       auto const m_kinetic = Plab.GetNorm();
-      if(i==0)
-	REQUIRE(m_kinetic / particles::PiPlus::GetMass() == Approx(1));
+      if (i == 0)
+        REQUIRE(m_kinetic / particles::PiPlus::GetMass() == Approx(1));
       else
-	REQUIRE_FALSE(m_kinetic / particles::PiMinus::GetMass() == Approx(1));
+        REQUIRE_FALSE(m_kinetic / particles::PiMinus::GetMass() == Approx(1));
     }
   }
 }