diff --git a/Documentation/Examples/cascade_example.cc b/Documentation/Examples/cascade_example.cc
index c219b3d49fe2afb893c2ef7a095e79c5dde92dc8..f5c09343babcf62f87135a2fadb124c74a144f7e 100644
--- a/Documentation/Examples/cascade_example.cc
+++ b/Documentation/Examples/cascade_example.cc
@@ -124,7 +124,7 @@ int main() {
     cout << "input momentum: " << plab.GetComponents() / 1_GeV << endl;
     stack.AddParticle(std::tuple<particles::Code, units::si::HEPEnergyType,
                                  corsika::stack::MomentumVector, geometry::Point,
-		      units::si::TimeType, unsigned short, unsigned short>{
+                                 units::si::TimeType, unsigned short, unsigned short>{
         beamCode, E0, plab, injectionPos, 0_ns, nuclA, nuclZ});
   }
 
diff --git a/Environment/LayeredSphericalAtmosphereBuilder.cc b/Environment/LayeredSphericalAtmosphereBuilder.cc
index 4d1631d54e42431cd1b36299af9083c643bce0e7..2366266e278606a684f935acf89f33ee73d49252 100644
--- a/Environment/LayeredSphericalAtmosphereBuilder.cc
+++ b/Environment/LayeredSphericalAtmosphereBuilder.cc
@@ -8,9 +8,9 @@
  * the license.
  */
 
-#include <corsika/environment/LayeredSphericalAtmosphereBuilder.h>
 #include <corsika/environment/FlatExponential.h>
 #include <corsika/environment/HomogeneousMedium.h>
+#include <corsika/environment/LayeredSphericalAtmosphereBuilder.h>
 #include <corsika/environment/SlidingPlanarExponential.h>
 
 using namespace corsika::environment;
diff --git a/Environment/testEnvironment.cc b/Environment/testEnvironment.cc
index 5c314d1d07b5b9a5faad15ea2345114a5fb8f3f1..574907e5914ec7e97628023483f4dd7572dde836 100644
--- a/Environment/testEnvironment.cc
+++ b/Environment/testEnvironment.cc
@@ -8,12 +8,12 @@
  * the license.
  */
 
-#include <corsika/environment/LayeredSphericalAtmosphereBuilder.h>
 #include <corsika/environment/DensityFunction.h>
 #include <corsika/environment/FlatExponential.h>
 #include <corsika/environment/HomogeneousMedium.h>
 #include <corsika/environment/IMediumModel.h>
 #include <corsika/environment/InhomogeneousMedium.h>
+#include <corsika/environment/LayeredSphericalAtmosphereBuilder.h>
 #include <corsika/environment/LinearApproximationIntegrator.h>
 #include <corsika/environment/NuclearComposition.h>
 #include <corsika/environment/SlidingPlanarExponential.h>
diff --git a/Processes/QGSJetII/QGSJetIIStack.h b/Processes/QGSJetII/QGSJetIIStack.h
index 70288ef4e3c0ee1ffeea5978b0e11e77c70fdc57..a58f3fe97fa6405530acc6eb9a61023fac2b551f 100644
--- a/Processes/QGSJetII/QGSJetIIStack.h
+++ b/Processes/QGSJetII/QGSJetIIStack.h
@@ -55,11 +55,12 @@ namespace corsika::process::qgsjetII {
       using namespace corsika::units::si;
       return qgarr14_.esp[i][0] * 1_GeV;
     }
-    MomentumVector GetMomentum(const unsigned int i, const corsika::geometry::CoordinateSystem& CS) const {
+    MomentumVector GetMomentum(const unsigned int i,
+                               const corsika::geometry::CoordinateSystem& CS) const {
       using namespace corsika::units::si;
       geometry::QuantityVector<hepmomentum_d> components = {qgarr14_.esp[i][2] * 1_GeV,
-                                                  qgarr14_.esp[i][3] * 1_GeV,
-                                                  qgarr14_.esp[i][1] * 1_GeV};
+                                                            qgarr14_.esp[i][3] * 1_GeV,
+                                                            qgarr14_.esp[i][1] * 1_GeV};
       return MomentumVector(CS, components);
     }
 
@@ -87,8 +88,7 @@ namespace corsika::process::qgsjetII {
     using corsika::stack::ParticleBase<StackIteratorInterface>::GetIndex;
 
   public:
-    void SetParticleData(const int vID, 
-                         const corsika::units::si::HEPEnergyType vE,
+    void SetParticleData(const int vID, const corsika::units::si::HEPEnergyType vE,
                          const MomentumVector& vP,
                          const corsika::units::si::HEPMassType vM) {
       SetPID(vID);
@@ -97,8 +97,7 @@ namespace corsika::process::qgsjetII {
     }
 
     void SetParticleData(ParticleInterface<StackIteratorInterface>& /*parent*/,
-                         const int vID, 
-                         const corsika::units::si::HEPEnergyType vE,
+                         const int vID, const corsika::units::si::HEPEnergyType vE,
                          const MomentumVector& vP,
                          const corsika::units::si::HEPMassType vM) {
       SetPID(vID);
@@ -121,7 +120,9 @@ namespace corsika::process::qgsjetII {
           GetStackData().GetId(GetIndex()));
     }
 
-    MomentumVector GetMomentum(const corsika::geometry::CoordinateSystem& CS) const { return GetStackData().GetMomentum(GetIndex(), CS); }
+    MomentumVector GetMomentum(const corsika::geometry::CoordinateSystem& CS) const {
+      return GetStackData().GetMomentum(GetIndex(), CS);
+    }
 
     void SetMomentum(const MomentumVector& v) {
       GetStackData().SetMomentum(GetIndex(), v);