diff --git a/Base/Axis/ConstKBinAxis.h b/Base/Axis/ConstKBinAxis.h
index 4868b26ff7a70685be6a8f348758d5035b600ee7..7b1fce97c3792f80e257093339383cf16782bc62 100644
--- a/Base/Axis/ConstKBinAxis.h
+++ b/Base/Axis/ConstKBinAxis.h
@@ -20,7 +20,7 @@
 //! Axis with fixed bin size in sin(angle) space.
 //! @ingroup tools
 
-class ConstKBinAxis final: public VariableBinAxis
+class ConstKBinAxis final : public VariableBinAxis
 {
 public:
     //! ConstKBinAxis constructor.
diff --git a/Core/Simulation/OffSpecSimulation.h b/Core/Simulation/OffSpecSimulation.h
index af7390ca4642480a3b0f1c7c157ffce6e2d1525f..ba4bc73ca3215d29dd237ce5ceedf109c2b66330 100644
--- a/Core/Simulation/OffSpecSimulation.h
+++ b/Core/Simulation/OffSpecSimulation.h
@@ -23,7 +23,7 @@ class Histogram2D;
 //! Main class to run an off-specular simulation.
 //! @ingroup simulation
 
-class OffSpecSimulation final: public ISimulation2D
+class OffSpecSimulation final : public ISimulation2D
 {
 public:
     OffSpecSimulation();
diff --git a/Device/Detector/SimpleUnitConverters.h b/Device/Detector/SimpleUnitConverters.h
index 5177ef554218b42f7af2bf459fa9ff1d3d68fdfd..c1d9a6080f62271ae39fb978b281d1c9b4803219 100644
--- a/Device/Detector/SimpleUnitConverters.h
+++ b/Device/Detector/SimpleUnitConverters.h
@@ -73,7 +73,7 @@ private:
 //! Its default units are radians for both axes
 //! @ingroup simulation_internal
 
-class SphericalConverter final: public UnitConverterSimple
+class SphericalConverter final : public UnitConverterSimple
 {
 public:
     SphericalConverter(const SphericalDetector& detector, const Beam& beam);
@@ -97,7 +97,7 @@ private:
 //! Its default units are mm for both axes
 //! @ingroup simulation_internal
 
-class RectangularConverter final: public UnitConverterSimple
+class RectangularConverter final : public UnitConverterSimple
 {
 public:
     RectangularConverter(const RectangularDetector& detector, const Beam& beam);
@@ -124,7 +124,7 @@ private:
 //! Its default units are radians for both axes
 //! @ingroup simulation_internal
 
-class OffSpecularConverter final: public UnitConverterSimple
+class OffSpecularConverter final : public UnitConverterSimple
 {
 public:
     OffSpecularConverter(const IDetector2D& detector, const Beam& beam, const IAxis& alpha_axis);
@@ -145,7 +145,7 @@ private:
 //! Its default units are radians for x-axis and nm for y-axis
 //! @ingroup simulation_internal
 
-class DepthProbeConverter final: public UnitConverterSimple
+class DepthProbeConverter final : public UnitConverterSimple
 {
 public:
     DepthProbeConverter(const Beam& beam, const IAxis& alpha_axis, const IAxis& z_axis);
diff --git a/GUI/coregui/Models/ParameterTranslators.h b/GUI/coregui/Models/ParameterTranslators.h
index 721d70ac46a664647ea55193721c7d101370122e..b7e1c23535fb95ef921a1f81e389dccb53bc119f 100644
--- a/GUI/coregui/Models/ParameterTranslators.h
+++ b/GUI/coregui/Models/ParameterTranslators.h
@@ -29,7 +29,7 @@ public:
     virtual QStringList translate(const QStringList& list) const = 0;
 };
 
-class ModelTypeTranslator final: public IPathTranslator
+class ModelTypeTranslator final : public IPathTranslator
 {
 public:
     ModelTypeTranslator(QString gui_model_type, QString domain_name);
@@ -44,7 +44,7 @@ private:
     QString m_domain_name;
 };
 
-class AddElementTranslator final: public IPathTranslator
+class AddElementTranslator final : public IPathTranslator
 {
 public:
     AddElementTranslator(QString gui_name, QString additional_name);
@@ -59,7 +59,7 @@ private:
     QString m_additional_name;
 };
 
-class RotationTranslator final: public IPathTranslator
+class RotationTranslator final : public IPathTranslator
 {
 public:
     ~RotationTranslator() override {}
@@ -69,7 +69,7 @@ public:
     QStringList translate(const QStringList& list) const override;
 };
 
-class DistributionNoneTranslator final: public IPathTranslator
+class DistributionNoneTranslator final : public IPathTranslator
 {
 public:
     ~DistributionNoneTranslator() override {}
@@ -79,7 +79,7 @@ public:
     QStringList translate(const QStringList& list) const override;
 };
 
-class RoughnessTranslator final: public IPathTranslator
+class RoughnessTranslator final : public IPathTranslator
 {
 public:
     RoughnessTranslator(const SessionItem* p_parent);
@@ -95,7 +95,7 @@ private:
     const SessionItem* m_parent;
 };
 
-class VectorParameterTranslator final: public IPathTranslator
+class VectorParameterTranslator final : public IPathTranslator
 {
 public:
     VectorParameterTranslator(QString gui_name, std::string base_name,
diff --git a/Sample/Aggregate/InterferenceFunction1DLattice.h b/Sample/Aggregate/InterferenceFunction1DLattice.h
index eb859e524f61e0239876a0433ef5b1e243eb9c89..44f7e06f50b82062769084a5b02d7c594b220bc8 100644
--- a/Sample/Aggregate/InterferenceFunction1DLattice.h
+++ b/Sample/Aggregate/InterferenceFunction1DLattice.h
@@ -22,7 +22,7 @@ class IFTDecayFunction1D;
 //! Interference function of a 1D lattice.
 //! @ingroup interference
 
-class InterferenceFunction1DLattice final: public IInterferenceFunction
+class InterferenceFunction1DLattice final : public IInterferenceFunction
 {
 public:
     InterferenceFunction1DLattice(double length, double xi);
diff --git a/Sample/Aggregate/InterferenceFunction2DLattice.h b/Sample/Aggregate/InterferenceFunction2DLattice.h
index b5b41f19200c50164502f7124824f24a6bfc89f2..561051654d9fa9602693386af4cf578451ac76f8 100644
--- a/Sample/Aggregate/InterferenceFunction2DLattice.h
+++ b/Sample/Aggregate/InterferenceFunction2DLattice.h
@@ -23,7 +23,7 @@
 //! Interference function of a 2D lattice.
 //! @ingroup interference
 
-class InterferenceFunction2DLattice final: public IInterferenceFunction
+class InterferenceFunction2DLattice final : public IInterferenceFunction
 {
 public:
     InterferenceFunction2DLattice(const Lattice2D& lattice);
diff --git a/Sample/Aggregate/InterferenceFunction2DParaCrystal.h b/Sample/Aggregate/InterferenceFunction2DParaCrystal.h
index bb35ae1f808562470635c423afc0092573bd6c79..7b66b7c53ba63b43d842504c8cf587d21470c4cd 100644
--- a/Sample/Aggregate/InterferenceFunction2DParaCrystal.h
+++ b/Sample/Aggregate/InterferenceFunction2DParaCrystal.h
@@ -26,7 +26,7 @@ class IFTDistribution2D;
 //! Interference function of a 2D paracrystal.
 //! @ingroup interference
 
-class InterferenceFunction2DParaCrystal final: public IInterferenceFunction
+class InterferenceFunction2DParaCrystal final : public IInterferenceFunction
 {
 public:
     InterferenceFunction2DParaCrystal(const Lattice2D& lattice, double damping_length,
diff --git a/Sample/Aggregate/InterferenceFunction2DSuperLattice.h b/Sample/Aggregate/InterferenceFunction2DSuperLattice.h
index 12bee07eea8f692ff29fca9bf64c8642c3431d0c..15eedd2162e6d2ecc1c87704798b0a9552e80624 100644
--- a/Sample/Aggregate/InterferenceFunction2DSuperLattice.h
+++ b/Sample/Aggregate/InterferenceFunction2DSuperLattice.h
@@ -22,7 +22,7 @@
 //! each lattice site.
 //! @ingroup interference
 
-class InterferenceFunction2DSuperLattice final: public IInterferenceFunction
+class InterferenceFunction2DSuperLattice final : public IInterferenceFunction
 {
 public:
     InterferenceFunction2DSuperLattice(const Lattice2D& lattice, unsigned size_1, unsigned size_2);
diff --git a/Sample/Aggregate/InterferenceFunction3DLattice.h b/Sample/Aggregate/InterferenceFunction3DLattice.h
index d51fc0dda9e023e20daf04a13030c81c00575b0b..73e9d408f624ff1854aa9201c54255cc83ccef6b 100644
--- a/Sample/Aggregate/InterferenceFunction3DLattice.h
+++ b/Sample/Aggregate/InterferenceFunction3DLattice.h
@@ -23,7 +23,7 @@ class IPeakShape;
 //! Interference function of a 3D lattice.
 //! @ingroup interference
 
-class InterferenceFunction3DLattice final: public IInterferenceFunction
+class InterferenceFunction3DLattice final : public IInterferenceFunction
 {
 public:
     InterferenceFunction3DLattice(const Lattice3D& lattice);
diff --git a/Sample/Aggregate/InterferenceFunctionHardDisk.h b/Sample/Aggregate/InterferenceFunctionHardDisk.h
index f491dd31aab774f0dba74c2274c824eb9b28c713..61b65681c496c4850e8b3748dc80915bd6b1a41d 100644
--- a/Sample/Aggregate/InterferenceFunctionHardDisk.h
+++ b/Sample/Aggregate/InterferenceFunctionHardDisk.h
@@ -24,7 +24,7 @@
 //! DOI: 10.1080/00268979500101211
 //! @ingroup interference
 
-class InterferenceFunctionHardDisk final: public IInterferenceFunction
+class InterferenceFunctionHardDisk final : public IInterferenceFunction
 {
 public:
     InterferenceFunctionHardDisk(double radius, double density, double position_var = 0);
diff --git a/Sample/Fresnel/MatrixFresnelMap.h b/Sample/Fresnel/MatrixFresnelMap.h
index 4f5d8b31933ffb616a6e262c350992ef316752f5..0e641400d28ccf5c5d8b8a9ec59113a035ded91a 100644
--- a/Sample/Fresnel/MatrixFresnelMap.h
+++ b/Sample/Fresnel/MatrixFresnelMap.h
@@ -41,8 +41,7 @@ public:
     MatrixFresnelMap& operator=(const MatrixFresnelMap& other) = delete;
 
     std::unique_ptr<const ILayerRTCoefficients>
-    getOutCoefficients(const SimulationElement& sim_element,
-                       size_t layer_index) const final;
+    getOutCoefficients(const SimulationElement& sim_element, size_t layer_index) const final;
 
     void setSlices(const std::vector<Slice>& slices) final;
 
diff --git a/Sample/HardParticle/FormFactorBox.h b/Sample/HardParticle/FormFactorBox.h
index 1638b40c432a99f32a28eae22193cfcdc4e180d8..4319d64b0d5595e50de6d2dc63b05391d1dc7fc5 100644
--- a/Sample/HardParticle/FormFactorBox.h
+++ b/Sample/HardParticle/FormFactorBox.h
@@ -26,10 +26,7 @@ public:
     FormFactorBox(const std::vector<double> P);
     FormFactorBox(double length, double width, double height);
 
-    FormFactorBox* clone() const final
-    {
-        return new FormFactorBox(m_length, m_width, m_height);
-    }
+    FormFactorBox* clone() const final { return new FormFactorBox(m_length, m_width, m_height); }
 
     void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
 
diff --git a/Sample/HardParticle/FormFactorCone.h b/Sample/HardParticle/FormFactorCone.h
index 4a26b159afeb4f066838afa93693200cd065530e..ac8715fda159eb999671a89dfdd55a1361117114 100644
--- a/Sample/HardParticle/FormFactorCone.h
+++ b/Sample/HardParticle/FormFactorCone.h
@@ -26,10 +26,7 @@ public:
     FormFactorCone(const std::vector<double> P);
     FormFactorCone(double radius, double height, double alpha);
 
-    FormFactorCone* clone() const final
-    {
-        return new FormFactorCone(m_radius, m_height, m_alpha);
-    }
+    FormFactorCone* clone() const final { return new FormFactorCone(m_radius, m_height, m_alpha); }
     void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
 
     double getHeight() const { return m_height; }
diff --git a/Sample/HardParticle/FormFactorCylinder.h b/Sample/HardParticle/FormFactorCylinder.h
index 478cb82317e8191729c4139000910bd98c371521..ef0bda1d4ad4a355de6e1ebcf2065dc783c81c5e 100644
--- a/Sample/HardParticle/FormFactorCylinder.h
+++ b/Sample/HardParticle/FormFactorCylinder.h
@@ -26,10 +26,7 @@ public:
     FormFactorCylinder(const std::vector<double> P);
     FormFactorCylinder(double radius, double height);
 
-    FormFactorCylinder* clone() const final
-    {
-        return new FormFactorCylinder(m_radius, m_height);
-    }
+    FormFactorCylinder* clone() const final { return new FormFactorCylinder(m_radius, m_height); }
     void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
 
     double getHeight() const { return m_height; }
diff --git a/Sample/HardParticle/FormFactorDodecahedron.h b/Sample/HardParticle/FormFactorDodecahedron.h
index e092b8dfbaa9afeb18a12b750877b0868794818c..47ac41c9ab3ffd00da898018d2f34dbd425d3899 100644
--- a/Sample/HardParticle/FormFactorDodecahedron.h
+++ b/Sample/HardParticle/FormFactorDodecahedron.h
@@ -26,10 +26,7 @@ public:
     FormFactorDodecahedron(const std::vector<double> P);
     FormFactorDodecahedron(double edge);
 
-    FormFactorDodecahedron* clone() const final
-    {
-        return new FormFactorDodecahedron(m_edge);
-    }
+    FormFactorDodecahedron* clone() const final { return new FormFactorDodecahedron(m_edge); }
     void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
 
     double getEdge() const { return m_edge; }
diff --git a/Sample/HardParticle/FormFactorIcosahedron.h b/Sample/HardParticle/FormFactorIcosahedron.h
index 1e0c40022ce8237c932027704a81f1617b562b57..30d95f03e98047ef44b7534bd75951e3ffbec9b3 100644
--- a/Sample/HardParticle/FormFactorIcosahedron.h
+++ b/Sample/HardParticle/FormFactorIcosahedron.h
@@ -26,10 +26,7 @@ public:
     FormFactorIcosahedron(const std::vector<double> P);
     FormFactorIcosahedron(double edge);
 
-    FormFactorIcosahedron* clone() const final
-    {
-        return new FormFactorIcosahedron(m_edge);
-    }
+    FormFactorIcosahedron* clone() const final { return new FormFactorIcosahedron(m_edge); }
     void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
 
     double getEdge() const { return m_edge; }
diff --git a/Sample/HardParticle/FormFactorPrism3.h b/Sample/HardParticle/FormFactorPrism3.h
index 7d7c1ab0fe638803f85fe4d39e9e3feae96a3f63..34778434c6b8a2d8dbf0d3fcbf351faf96119143 100644
--- a/Sample/HardParticle/FormFactorPrism3.h
+++ b/Sample/HardParticle/FormFactorPrism3.h
@@ -26,10 +26,7 @@ public:
     FormFactorPrism3(const std::vector<double> P);
     FormFactorPrism3(double base_edge, double height);
 
-    FormFactorPrism3* clone() const final
-    {
-        return new FormFactorPrism3(m_base_edge, m_height);
-    }
+    FormFactorPrism3* clone() const final { return new FormFactorPrism3(m_base_edge, m_height); }
     void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
 
     double getBaseEdge() const { return m_base_edge; }
diff --git a/Sample/HardParticle/FormFactorPrism6.h b/Sample/HardParticle/FormFactorPrism6.h
index 3632e0bb10e53e6b1e35adaac95d62985a94df1f..79e9c816ef0517f172cb1b96dbdfdf6d55b8f097 100644
--- a/Sample/HardParticle/FormFactorPrism6.h
+++ b/Sample/HardParticle/FormFactorPrism6.h
@@ -26,10 +26,7 @@ public:
     FormFactorPrism6(const std::vector<double> P);
     FormFactorPrism6(double base_edge, double height);
 
-    FormFactorPrism6* clone() const final
-    {
-        return new FormFactorPrism6(m_base_edge, m_height);
-    }
+    FormFactorPrism6* clone() const final { return new FormFactorPrism6(m_base_edge, m_height); }
     void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
 
     double getBaseEdge() const { return m_base_edge; }
diff --git a/Sample/Particle/FormFactorCrystal.h b/Sample/Particle/FormFactorCrystal.h
index 592edc64a7d1ab0f494cadde63063d21cd3316be..8f5cbcff90500a79a0dc3499b720cfb9546435ed 100644
--- a/Sample/Particle/FormFactorCrystal.h
+++ b/Sample/Particle/FormFactorCrystal.h
@@ -21,7 +21,7 @@
 //! The form factor of a MesoCrystal.
 //! @ingroup formfactors
 
-class FormFactorCrystal final: public IFormFactor
+class FormFactorCrystal final : public IFormFactor
 {
 public:
     FormFactorCrystal(const Lattice3D& lattice, const IFormFactor& basis_form_factor,
diff --git a/Sample/Scattering/FormFactorDecoratorMaterial.h b/Sample/Scattering/FormFactorDecoratorMaterial.h
index b0a89c7b8ee5a2c3c42e0f7a849bc493b3da9b69..41da1b349f8ef54250b8d5f92953bc96a4b74cad 100644
--- a/Sample/Scattering/FormFactorDecoratorMaterial.h
+++ b/Sample/Scattering/FormFactorDecoratorMaterial.h
@@ -23,7 +23,7 @@
 //! refractive index and that of its surrounding material.
 //! @ingroup formfactors_decorations
 
-class FormFactorDecoratorMaterial final: public IFormFactorDecorator
+class FormFactorDecoratorMaterial final : public IFormFactorDecorator
 {
 public:
     FormFactorDecoratorMaterial(const IFormFactor& ff);
diff --git a/Sample/SoftParticle/FormFactorGauss.h b/Sample/SoftParticle/FormFactorGauss.h
index 5fb9768bd6e54c6773672a7db4abc5f4fd53ab55..2e6a650fe2bbd3c2468287d1c7f539746b79fe5e 100644
--- a/Sample/SoftParticle/FormFactorGauss.h
+++ b/Sample/SoftParticle/FormFactorGauss.h
@@ -26,10 +26,7 @@ public:
     FormFactorGaussSphere(const std::vector<double> P);
     FormFactorGaussSphere(double mean_radius);
 
-    FormFactorGaussSphere* clone() const final
-    {
-        return new FormFactorGaussSphere(m_mean_radius);
-    }
+    FormFactorGaussSphere* clone() const final { return new FormFactorGaussSphere(m_mean_radius); }
     void accept(INodeVisitor* visitor) const final { visitor->visit(this); }
 
     double getMeanRadius() const { return m_mean_radius; }