diff --git a/Core/Computation/RoughMultiLayerComputation.cpp b/Core/Computation/RoughMultiLayerComputation.cpp
index d411862980a0e5973e266889582c78f883d34dea..1be44ca381e18d25c4db34ec865ac96020ea2ba4 100644
--- a/Core/Computation/RoughMultiLayerComputation.cpp
+++ b/Core/Computation/RoughMultiLayerComputation.cpp
@@ -18,9 +18,9 @@
 #include "Core/Computation/ProcessedSample.h"
 #include "Sample/Fresnel/IFresnelMap.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/RT/ILayerRTCoefficients.h"
+#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Slice/LayerRoughness.h"
 
 #include <cerf>
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index 32cd4fa48be41c478e1980f71b978d49e006fc33..4426a7dcaf9b2897ddbeb7264862785a484c9c75 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -21,7 +21,6 @@
 #include "Sample/Aggregate/InterferenceFunctions.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Crystal.h"
 #include "Sample/Particle/MesoCrystal.h"
@@ -29,6 +28,7 @@
 #include "Sample/Particle/ParticleComposition.h"
 #include "Sample/Particle/ParticleCoreShell.h"
 #include "Sample/Particle/ParticleDistribution.h"
+#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Slice/LayerRoughness.h"
 #include <iomanip>
 #include <map>
diff --git a/Device/Scan/AngularSpecScan.cpp b/Device/Scan/AngularSpecScan.cpp
index b5ede1ccd4cbcb1b18f606f259d5660c5bd5db91..2bd24fd8d0a86f51b80e114df9f47b7f3f6c1c64 100644
--- a/Device/Scan/AngularSpecScan.cpp
+++ b/Device/Scan/AngularSpecScan.cpp
@@ -91,7 +91,7 @@ std::vector<SpecularSimulationElement> AngularSpecScan::generateSimulationElemen
         const double wl = paired_values[i].first;
         const double inc = paired_values[i].second;
         result.emplace_back(wl, -inc);
-        if (wl<0 || inc<0 || inc>M_PI_2)
+        if (wl < 0 || inc < 0 || inc > M_PI_2)
             result.back().setCalculationFlag(false); // false = exclude from calculations
     }
 
@@ -204,7 +204,8 @@ std::vector<double> AngularSpecScan::footprint(size_t start, size_t n_elements)
         for (size_t k = pos_inc; k < n_inc_samples && left > 0; ++k) {
             pos_inc = 0;
             double angle = sample_values[i][k];
-            double footprint = (angle>=0 && angle<=M_PI_2) ? m_footprint->calculate(angle) : 1.0;
+            double footprint =
+                (angle >= 0 && angle <= M_PI_2) ? m_footprint->calculate(angle) : 1.0;
             for (size_t j = pos_wl; j < n_wl_samples && left > 0; ++j) {
                 pos_wl = 0;
                 result[pos_res] = footprint;
@@ -226,10 +227,10 @@ AngularSpecScan::createIntensities(const std::vector<SpecularSimulationElement>&
     const size_t axis_size = m_inc_angle->size();
     std::vector<double> result(axis_size, 0.0);
 
-    const auto wl_weights = extractValues(applyWlResolution(),
-                                    [](const ParameterSample& sample) { return sample.weight; });
-    const auto inc_weights = extractValues(applyIncResolution(),
-                                     [](const ParameterSample& sample) { return sample.weight; });
+    const auto wl_weights = extractValues(
+        applyWlResolution(), [](const ParameterSample& sample) { return sample.weight; });
+    const auto inc_weights = extractValues(
+        applyIncResolution(), [](const ParameterSample& sample) { return sample.weight; });
 
     size_t elem_pos = 0;
     for (size_t i = 0; i < axis_size; ++i) {
diff --git a/Device/Scan/QSpecScan.cpp b/Device/Scan/QSpecScan.cpp
index b7de4e5ebea31c6d156fc91a94695161a43b526e..d3c8376f81f3300db08e9a34a5bfb3e268420369 100644
--- a/Device/Scan/QSpecScan.cpp
+++ b/Device/Scan/QSpecScan.cpp
@@ -61,7 +61,7 @@ std::vector<SpecularSimulationElement> QSpecScan::generateSimulationElements() c
     result.reserve(qz.size());
     for (size_t i = 0, size = qz.size(); i < size; ++i) {
         result.emplace_back(-qz[i] / 2.0);
-        if (qz[i]<0)
+        if (qz[i] < 0)
             result.back().setCalculationFlag(false); // false = exclude from calculations
     }
 
@@ -160,7 +160,7 @@ void QSpecScan::checkInitialization()
         throw std::runtime_error("Error in QSpecScan::checkInitialization: q-vector values shall "
                                  "be sorted in ascending order.");
 
-    if (axis_values.front()<0)
+    if (axis_values.front() < 0)
         throw std::runtime_error("Error in QSpecScan::checkInitialization: q-vector values are out "
                                  "of acceptable range.");
 }
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index 9005bd3322598ffe49d0ae58eb53a65052289821..8eec681802dae3d16b90ad2d1d2f4d399e3a4240 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -59,8 +59,8 @@
 #include "Param/Varia/ParameterPattern.h"
 #include "Sample/Aggregate/InterferenceFunctions.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Particle/Particle.h"
+#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Slice/LayerRoughness.h"
 
 using namespace INodeUtils;
diff --git a/Sample/Multilayer/MultiLayer.cpp b/Sample/Multilayer/MultiLayer.cpp
index 9d1ea591e3d21a163182e159cd37840cc0a77bd7..1a9228ab7bc95209fb4b7130aee2df0d50179ff5 100644
--- a/Sample/Multilayer/MultiLayer.cpp
+++ b/Sample/Multilayer/MultiLayer.cpp
@@ -19,9 +19,9 @@
 #include "Sample/Correlations/ILayout.h"
 #include "Sample/Material/MaterialUtils.h"
 #include "Sample/Multilayer/Layer.h"
+#include "Sample/Multilayer/MultiLayerUtils.h"
 #include "Sample/Scattering/LayerFillLimits.h"
 #include "Sample/Slice/LayerInterface.h"
-#include "Sample/Multilayer/MultiLayerUtils.h"
 #include "Sample/Slice/LayerRoughness.h"
 
 MultiLayer::MultiLayer() : m_crossCorrLength(0)
diff --git a/Sample/Multilayer/MultiLayerUtils.cpp b/Sample/Multilayer/MultiLayerUtils.cpp
index 19a8aa423bf470738ba57f5ab7ed114b27dede40..befbd7a17c2ac8781bf9a17a2eb6973cae180cc7 100644
--- a/Sample/Multilayer/MultiLayerUtils.cpp
+++ b/Sample/Multilayer/MultiLayerUtils.cpp
@@ -16,10 +16,10 @@
 #include "Sample/Correlations/ILayout.h"
 #include "Sample/Material/MaterialUtils.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Scattering/LayerFillLimits.h"
-#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/IParticle.h"
+#include "Sample/Scattering/LayerFillLimits.h"
+#include "Sample/Slice/LayerInterface.h"
 
 namespace
 {
diff --git a/Sample/Particle/Crystal.cpp b/Sample/Particle/Crystal.cpp
index 0cf67b78afa495641f369d3ce97fd375b1b94eaf..f601fd2038e2efaa13dcea07846460abf180ace9 100644
--- a/Sample/Particle/Crystal.cpp
+++ b/Sample/Particle/Crystal.cpp
@@ -47,8 +47,8 @@ IFormFactor* Crystal::createTotalFormFactor(const IFormFactor& meso_crystal_form
         P_basis_clone->rotate(*p_rotation);
     P_basis_clone->translate(translation);
     const std::unique_ptr<IFormFactor> P_basis_ff(P_basis_clone->createFormFactor());
-    return new FormFactorCrystal(
-        transformed_lattice, *P_basis_ff, meso_crystal_form_factor, m_position_variance);
+    return new FormFactorCrystal(transformed_lattice, *P_basis_ff, meso_crystal_form_factor,
+                                 m_position_variance);
 }
 
 std::vector<HomogeneousRegion> Crystal::homogeneousRegions() const
diff --git a/Sample/Specular/SpecularMagneticOldStrategy.cpp b/Sample/Specular/SpecularMagneticOldStrategy.cpp
index 2d3d8b1d8cecd8a326d88837e224de8a0fcf5d3e..b58f980c5011ddf9b6a755fa05bc8bef4bf63623 100644
--- a/Sample/Specular/SpecularMagneticOldStrategy.cpp
+++ b/Sample/Specular/SpecularMagneticOldStrategy.cpp
@@ -15,8 +15,8 @@
 #include "Sample/Specular/SpecularMagneticOldStrategy.h"
 #include "Sample/Material/WavevectorInfo.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Slice/Slice.h"
 #include <Eigen/LU>
 
diff --git a/Sample/Specular/SpecularScalarStrategy.cpp b/Sample/Specular/SpecularScalarStrategy.cpp
index 2012ab735bf739d4f2cce2fdfe79581a74cd15f3..e341927376138bfa96d3b3e9320db0cf9652652c 100644
--- a/Sample/Specular/SpecularScalarStrategy.cpp
+++ b/Sample/Specular/SpecularScalarStrategy.cpp
@@ -13,8 +13,8 @@
 // ************************************************************************** //
 
 #include "Sample/Specular/SpecularScalarStrategy.h"
-#include "Sample/Slice/KzComputation.h"
 #include "Sample/Multilayer/Layer.h"
+#include "Sample/Slice/KzComputation.h"
 #include "Sample/Slice/LayerRoughness.h"
 #include "Sample/Slice/Slice.h"
 #include <Eigen/Dense>
diff --git a/Sample/StandardSamples/CylindersBuilder.cpp b/Sample/StandardSamples/CylindersBuilder.cpp
index 896f10d228b29cedf92868b43662fb536e8ef3cd..034d965458885668e83027e09bcbb6093f1a0abd 100644
--- a/Sample/StandardSamples/CylindersBuilder.cpp
+++ b/Sample/StandardSamples/CylindersBuilder.cpp
@@ -17,9 +17,9 @@
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/FormFactorCylinder.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
+#include "Sample/Slice/LayerInterface.h"
 #include "Sample/StandardSamples/ReferenceMaterials.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp b/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
index ba42d4eb4fb9b01c6e5ac314636d4d02fde0eb34..cce776fcf147a5a9b497f82455c3a09e2240e6bc 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
+++ b/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
@@ -17,10 +17,10 @@
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/FormFactorFullSphere.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
 #include "Sample/SampleBuilderEngine/SampleComponents.h"
+#include "Sample/Slice/LayerInterface.h"
 #include "Sample/StandardSamples/ReferenceMaterials.h"
 
 namespace
diff --git a/Sample/StandardSamples/MagneticParticlesBuilder.cpp b/Sample/StandardSamples/MagneticParticlesBuilder.cpp
index 9f3a9e2977cecc333ffae231868ca7b7d3e367c9..8d2387fb7ff25c204e6a441ca767f68390c311ea 100644
--- a/Sample/StandardSamples/MagneticParticlesBuilder.cpp
+++ b/Sample/StandardSamples/MagneticParticlesBuilder.cpp
@@ -19,9 +19,9 @@
 #include "Sample/HardParticle/FormFactorFullSphere.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
+#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Slice/LayerRoughness.h"
 
 // ----------------------------------------------------------------------------
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
index 4fb93d55443c2a49409391a0c2c0704daca93803..76c4ebfe8401599917798eb1f5e6ec047bb3db15 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
@@ -1,10 +1,10 @@
 #include "Base/Const/Units.h"
 #include "Core/Computation/ProcessedSample.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
-#include "Sample/Slice/KzComputation.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/RT/SimulationOptions.h"
+#include "Sample/Slice/KzComputation.h"
 #include "Sample/Specular/SpecularMagneticNewTanhStrategy.h"
 #include "Sample/Specular/SpecularMagneticStrategy.h"
 #include "Sample/Specular/SpecularScalarTanhStrategy.h"
@@ -52,7 +52,7 @@ template <> void SpecularMagneticTest::test_degenerate<SpecularMagneticNewTanhSt
     }
 }
 
-    //! Compares results with scalar case
+//! Compares results with scalar case
 template <typename Strategy>
 void SpecularMagneticTest::testZeroField(const kvector_t& k, const ProcessedSample& sample)
 {
diff --git a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
index fd1818a6d099adf8b42d252d7d3b5f328ba92ee0..3834589e019a2f3dc68961d7b5327259ae202bfa 100644
--- a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
@@ -4,8 +4,8 @@
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Multilayer/MultiLayerUtils.h"
+#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Slice/LayerRoughness.h"
 #include "Tests/GTestWrapper/google_test.h"
 
diff --git a/Tests/UnitTests/Core/Sample/RTTest.cpp b/Tests/UnitTests/Core/Sample/RTTest.cpp
index 55445a64b6e896187418d80421e3176d047be300..cd6fce27abd58d1cb906677c55d046a7c7ad0df3 100644
--- a/Tests/UnitTests/Core/Sample/RTTest.cpp
+++ b/Tests/UnitTests/Core/Sample/RTTest.cpp
@@ -3,9 +3,9 @@
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/RT/SimulationOptions.h"
+#include "Sample/Slice/LayerInterface.h"
 #include "Sample/Slice/LayerRoughness.h"
 #include "Sample/Specular/SpecularScalarTanhStrategy.h"
 #include "Tests/GTestWrapper/google_test.h"