diff --git a/Base/Utils/MathFunctions.cpp b/Base/Utils/MathFunctions.cpp
index 3b497aeacdfff7341c88a28f61e6299ef3e61456..1694d6a49e232b7d9a9d69e89394b89488d4ed12 100644
--- a/Base/Utils/MathFunctions.cpp
+++ b/Base/Utils/MathFunctions.cpp
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#include "Base/Const/MathConstants.h"
 #include "Base/Utils/MathFunctions.h"
+#include "Base/Const/MathConstants.h"
 #include <chrono>
 #include <cstring>
 #include <fftw3.h>
diff --git a/Base/Utils/MathFunctions.h b/Base/Utils/MathFunctions.h
index 3f2ab498e311e0f5164f311ccd3476e11fcc1668..38ccb654b53ba2fa6e8adaf2a4a85093f36897ac 100644
--- a/Base/Utils/MathFunctions.h
+++ b/Base/Utils/MathFunctions.h
@@ -53,9 +53,9 @@ double erf(double arg);
 //  Random number generators
 // ************************************************************************** //
 
-//double GenerateUniformRandom();
-//double GenerateStandardNormalRandom();
-//double GenerateNormalRandom(double average, double std_dev);
+// double GenerateUniformRandom();
+// double GenerateStandardNormalRandom();
+// double GenerateNormalRandom(double average, double std_dev);
 double GeneratePoissonRandom(double average);
 
 } // Namespace Math
diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index 6c146a2555af77b3ce79b5b1d7bf6afbfb3b29d7..86845e34737f12cddfdc54efb36a753cf30da02a 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -217,7 +217,8 @@ std::string SimulationToPython::defineDetector(const ISimulation* simulation) co
     return result.str();
 }
 
-std::string SimulationToPython::defineDetectorResolutionFunction(const ISimulation* simulation) const
+std::string
+SimulationToPython::defineDetectorResolutionFunction(const ISimulation* simulation) const
 {
     std::ostringstream result;
     const IDetector* detector = simulation->instrument().getDetector();
diff --git a/Core/Simulation/ISimulation.cpp b/Core/Simulation/ISimulation.cpp
index 41e85c78c820b1f44a36b9948e1a1a3dd609771b..a6d505564a75c266bd6c210939bf976ae960031d 100644
--- a/Core/Simulation/ISimulation.cpp
+++ b/Core/Simulation/ISimulation.cpp
@@ -160,7 +160,7 @@ void ISimulation::setDetectorResolutionFunction(const IResolutionFunction2D& res
 
 //! Sets the polarization analyzer characteristics of the detector
 void ISimulation::setAnalyzerProperties(const kvector_t direction, double efficiency,
-                                       double total_transmission)
+                                        double total_transmission)
 {
     instrument().setAnalyzerProperties(direction, efficiency, total_transmission);
 }
@@ -266,8 +266,8 @@ std::vector<const INode*> ISimulation::getChildren() const
 }
 
 void ISimulation::addParameterDistribution(const std::string& param_name,
-                                          const IDistribution1D& distribution, size_t nbr_samples,
-                                          double sigma_factor, const RealLimits& limits)
+                                           const IDistribution1D& distribution, size_t nbr_samples,
+                                           double sigma_factor, const RealLimits& limits)
 {
     ParameterDistribution par_distr(param_name, distribution, nbr_samples, sigma_factor, limits);
     addParameterDistribution(par_distr);
@@ -310,7 +310,7 @@ void ISimulation::runSingleSimulation(size_t batch_start, size_t batch_size, dou
 //! corresponding to the masked areas of the detector will be set to zero.
 
 SimulationResult ISimulation::convertData(const OutputData<double>& data,
-                                         bool put_masked_areas_to_zero)
+                                          bool put_masked_areas_to_zero)
 {
     auto converter = UnitConverterUtils::createConverter(*this);
     auto roi_data = UnitConverterUtils::createOutputData(*converter, converter->defaultUnits());
diff --git a/Core/Simulation/ISimulation2D.cpp b/Core/Simulation/ISimulation2D.cpp
index 45478a4da57c68c63585cb05da6f474ce4f2be6f..172a00bbc56c787ac82c9e531d79287e67a0b9c8 100644
--- a/Core/Simulation/ISimulation2D.cpp
+++ b/Core/Simulation/ISimulation2D.cpp
@@ -62,7 +62,7 @@ size_t ISimulation2D::numberOfSimulationElements() const
 }
 
 void ISimulation2D::setDetectorParameters(size_t n_x, double x_min, double x_max, size_t n_y,
-                                         double y_min, double y_max)
+                                          double y_min, double y_max)
 {
     instrument().detector2D().setDetectorParameters(n_x, x_min, x_max, n_y, y_min, y_max);
     updateIntensityMap();
@@ -75,7 +75,7 @@ void ISimulation2D::setDetector(const IDetector2D& detector)
 }
 
 std::unique_ptr<IComputation> ISimulation2D::generateSingleThreadedComputation(size_t start,
-                                                                              size_t n_elements)
+                                                                               size_t n_elements)
 {
     ASSERT(start < m_sim_elements.size() && start + n_elements <= m_sim_elements.size());
     const auto& begin = m_sim_elements.begin() + static_cast<long>(start);
diff --git a/GUI/coregui/Models/DomainSimulationBuilder.h b/GUI/coregui/Models/DomainSimulationBuilder.h
index 38d77a87762669727b4e7b07e2da1bbe26d3547d..bb85a194a0824ada92c4fce6761f301d42929694 100644
--- a/GUI/coregui/Models/DomainSimulationBuilder.h
+++ b/GUI/coregui/Models/DomainSimulationBuilder.h
@@ -30,8 +30,8 @@ namespace DomainSimulationBuilder
 //! Creates domain simulation from sample and instrument items.
 
 std::unique_ptr<ISimulation> createSimulation(const MultiLayerItem* sampleItem,
-                                             const InstrumentItem* instrumentItem,
-                                             const SimulationOptionsItem* optionsItem = nullptr);
+                                              const InstrumentItem* instrumentItem,
+                                              const SimulationOptionsItem* optionsItem = nullptr);
 }; // namespace DomainSimulationBuilder
 
 #endif // BORNAGAIN_GUI_COREGUI_MODELS_DOMAINSIMULATIONBUILDER_H
diff --git a/GUI/coregui/Models/JobQueueData.cpp b/GUI/coregui/Models/JobQueueData.cpp
index d7f3834f1270dde852ebc4d130a9801b828d240e..905fae08258de3627b670136a01d4fe70624ad6d 100644
--- a/GUI/coregui/Models/JobQueueData.cpp
+++ b/GUI/coregui/Models/JobQueueData.cpp
@@ -43,7 +43,8 @@ void JobQueueData::runJob(JobItem* jobItem)
         return;
 
     if (getSimulation(identifier))
-        throw GUIHelpers::Error("JobQueueData::runJob() -> Error. ISimulation is already existing.");
+        throw GUIHelpers::Error(
+            "JobQueueData::runJob() -> Error. ISimulation is already existing.");
 
     try {
         auto simulation = DomainSimulationBuilder::createSimulation(
diff --git a/GUI/coregui/Models/JobQueueData.h b/GUI/coregui/Models/JobQueueData.h
index 7be8896d3aed4649cb9ff70cf6749d87ab979dcf..ae099511bf1896a2c4cd834871749f5b31703e58 100644
--- a/GUI/coregui/Models/JobQueueData.h
+++ b/GUI/coregui/Models/JobQueueData.h
@@ -61,8 +61,8 @@ private:
     JobWorker* getWorker(const QString& identifier);
     ISimulation* getSimulation(const QString& identifier);
 
-    QMap<QString, QThread*> m_threads;        //! job identifier to the thread
-    QMap<QString, JobWorker*> m_workers;      //! job identifier to jobWorker
+    QMap<QString, QThread*> m_threads;         //! job identifier to the thread
+    QMap<QString, JobWorker*> m_workers;       //! job identifier to jobWorker
     QMap<QString, ISimulation*> m_simulations; //! job identifier to simulation
 
     JobModel* m_jobModel;
diff --git a/GUI/coregui/Models/JobWorker.cpp b/GUI/coregui/Models/JobWorker.cpp
index 8d5b069805300b8892e93397d789d745603a2924..9a2cd577894e8a09a056c5d2002395087f6fc592 100644
--- a/GUI/coregui/Models/JobWorker.cpp
+++ b/GUI/coregui/Models/JobWorker.cpp
@@ -58,7 +58,8 @@ void JobWorker::start()
         } catch (const std::exception& ex) {
             m_job_status = "Failed";
             m_percentage_done = 100;
-            m_failure_message = "JobRunner::start() -> ISimulation failed with exception throw:\n\n";
+            m_failure_message =
+                "JobRunner::start() -> ISimulation failed with exception throw:\n\n";
 
             m_failure_message.append(QString(ex.what()));
         }
diff --git a/Param/Base/ParameterPool.h b/Param/Base/ParameterPool.h
index dc06f8f7bf3f3d384bfd81f9a2ce59c983873b27..259fd2e3d10ad08ef52ff2815a0eb8d5b45b83c3 100644
--- a/Param/Base/ParameterPool.h
+++ b/Param/Base/ParameterPool.h
@@ -69,7 +69,7 @@ public:
 
     void removeParameter(const std::string& name);
 
-    RealParameter* operator[](size_t index); // used by libBornAgainParam.i
+    RealParameter* operator[](size_t index);             // used by libBornAgainParam.i
     const RealParameter* operator[](size_t index) const; // needed by the above
 
 private:
diff --git a/Sample/SampleBuilderEngine/IRegistry.h b/Sample/SampleBuilderEngine/IRegistry.h
index 0d33299a298769eddab85fab3bf5c32defc9e64f..38ccd05444748f23c2fb16d37e0a6477db368303 100644
--- a/Sample/SampleBuilderEngine/IRegistry.h
+++ b/Sample/SampleBuilderEngine/IRegistry.h
@@ -17,9 +17,9 @@
 
 #include <map>
 #include <memory>
+#include <stdexcept>
 #include <string>
 #include <vector>
-#include <stdexcept>
 
 //! @class IRegistry
 //! @ingroup tools_internal