diff --git a/GUI/coregui/Models/FTDecayFunctionItems.cpp b/GUI/coregui/Models/FTDecayFunctionItems.cpp
index 4833961ae5b80213eb227d6627dbc8ecd08920e5..70958141f6db9e5f437391533cf5230ea0af5685 100644
--- a/GUI/coregui/Models/FTDecayFunctionItems.cpp
+++ b/GUI/coregui/Models/FTDecayFunctionItems.cpp
@@ -102,16 +102,17 @@ void FTDecayFunction2DItem::add_decay_property()
 {
     addProperty(P_DECAY_LENGTH_X, 1000.0)
         ->setToolTip("Decay length (half-width of the distribution in nanometers) "
-                                    "\nalong x-axis of the distribution");
+                     "\nalong x-axis of the distribution");
     addProperty(P_DECAY_LENGTH_Y, 1000.0)
         ->setToolTip("Decay length (half-width of the distribution in nanometers) "
-                                    "\nalong y-axis of the distribution");
+                     "\nalong y-axis of the distribution");
 }
 
 void FTDecayFunction2DItem::add_gammadelta_property()
 {
     addProperty(P_GAMMA, 0.0)
-        ->setToolTip("Distribution orientation with respect to the first lattice vector in degrees");
+        ->setToolTip(
+            "Distribution orientation with respect to the first lattice vector in degrees");
     addProperty(P_DELTA, 90.0)->setVisible(false);
 }
 
diff --git a/GUI/coregui/Models/FTDistributionItems.cpp b/GUI/coregui/Models/FTDistributionItems.cpp
index c83f4cb5af3a9318ca5d2e364ac5ecb41b0ace80..08d2492f5c5a187c994d8b758f1fd4fb53846c14 100644
--- a/GUI/coregui/Models/FTDistributionItems.cpp
+++ b/GUI/coregui/Models/FTDistributionItems.cpp
@@ -21,8 +21,7 @@ FTDistribution1DItem::FTDistribution1DItem(const QString& name) : SessionItem(na
 
 void FTDistribution1DItem::add_omega_property()
 {
-    addProperty(P_OMEGA, 1.0)
-        ->setToolTip("Half-width of the distribution in nanometers");
+    addProperty(P_OMEGA, 1.0)->setToolTip("Half-width of the distribution in nanometers");
 }
 
 // --------------------------------------------------------------------------------------------- //
@@ -125,19 +124,16 @@ FTDistribution2DItem::FTDistribution2DItem(const QString& name) : SessionItem(na
 void FTDistribution2DItem::add_omega_properties()
 {
     addProperty(P_OMEGA_X, 1.0)
-        ->setToolTip(
-            "Half-width of the distribution along its x-axis in nanometers");
+        ->setToolTip("Half-width of the distribution along its x-axis in nanometers");
     addProperty(P_OMEGA_Y, 1.0)
-        ->setToolTip(
-            "Half-width of the distribution along its y-axis in nanometers");
+        ->setToolTip("Half-width of the distribution along its y-axis in nanometers");
 }
 
 void FTDistribution2DItem::add_gamma_property()
 {
     addProperty(P_GAMMA, 0.0)
-        ->setToolTip(
-            "Angle in direct space between "
-                           "first lattice vector \nand x-axis of the distribution in degrees");
+        ->setToolTip("Angle in direct space between "
+                     "first lattice vector \nand x-axis of the distribution in degrees");
 }
 
 void FTDistribution2DItem::add_properties()
diff --git a/GUI/coregui/Models/FitParameterProxyModel.cpp b/GUI/coregui/Models/FitParameterProxyModel.cpp
index a3c1465bfbce5d57ebf17e823e9d80ef839c3173..5a17cc2fb0d242f446e58b925181214f10fba715 100644
--- a/GUI/coregui/Models/FitParameterProxyModel.cpp
+++ b/GUI/coregui/Models/FitParameterProxyModel.cpp
@@ -29,12 +29,9 @@ FitParameterProxyModel::FitParameterProxyModel(FitParameterContainerItem* fitPar
 {
     addColumn(PAR_NAME, "Name", "Name of fit parameter");
     addColumn(PAR_TYPE, FitParameterItem::P_TYPE, "Fit parameter limits type");
-    addColumn(PAR_VALUE, FitParameterItem::P_START_VALUE,
-              "Starting value of fit parameter");
-    addColumn(PAR_MIN, FitParameterItem::P_MIN,
-              "Lower bound on fit parameter value");
-    addColumn(PAR_MAX, FitParameterItem::P_MAX,
-              "Upper bound on fit parameter value");
+    addColumn(PAR_VALUE, FitParameterItem::P_START_VALUE, "Starting value of fit parameter");
+    addColumn(PAR_MIN, FitParameterItem::P_MIN, "Lower bound on fit parameter value");
+    addColumn(PAR_MAX, FitParameterItem::P_MAX, "Upper bound on fit parameter value");
 
     connectModel(fitParContainer->model());
 
diff --git a/GUI/coregui/Models/InterferenceFunctionItems.cpp b/GUI/coregui/Models/InterferenceFunctionItems.cpp
index 5a31457b5ef9e85277b215f137af7964e4aa22e4..064cac21b45f5cdd7639d38993b30e24b5c5afde 100644
--- a/GUI/coregui/Models/InterferenceFunctionItems.cpp
+++ b/GUI/coregui/Models/InterferenceFunctionItems.cpp
@@ -59,11 +59,10 @@ InterferenceFunction1DLatticeItem::InterferenceFunction1DLatticeItem()
     : InterferenceFunctionItem("Interference1DLattice")
 {
     setToolTip("Interference function of a 1D lattice");
-    addProperty(P_LENGTH, 20.0 * Units::nanometer)
-        ->setToolTip("Lattice length in nanometers");
+    addProperty(P_LENGTH, 20.0 * Units::nanometer)->setToolTip("Lattice length in nanometers");
     addProperty(P_ROTATION_ANGLE, 0.0)
         ->setToolTip("Rotation of lattice with respect to x-axis of reference \n"
-                                    "frame (beam direction) in degrees ");
+                     "frame (beam direction) in degrees ");
     addGroupProperty(P_DECAY_FUNCTION, "Decay function 1D")
         ->setToolTip("One-dimensional decay function (finite size effects)");
 }
@@ -160,8 +159,7 @@ InterferenceFunction2DParaCrystalItem::InterferenceFunction2DParaCrystalItem()
         ->setToolTip("Enables/disables averaging over the lattice rotation angle.");
 
     addProperty(P_DAMPING_LENGTH, 0.0)
-        ->setToolTip(
-            "The damping (coherence) length of the paracrystal in nanometers");
+        ->setToolTip("The damping (coherence) length of the paracrystal in nanometers");
 
     addProperty(P_DOMAIN_SIZE1, 20.0 * Units::micrometer)
         ->setToolTip("Size of the coherent domain along the first basis vector in nanometers");
@@ -260,10 +258,8 @@ InterferenceFunctionFinite2DLatticeItem::InterferenceFunctionFinite2DLatticeItem
         ->setToolTip("Type of lattice");
     addProperty(P_XI_INTEGRATION, false)
         ->setToolTip("Enables/disables averaging over the lattice rotation angle.");
-    addProperty(P_DOMAIN_SIZE_1, 100u)
-        ->setToolTip("Domain size 1 in number of unit cells");
-    addProperty(P_DOMAIN_SIZE_2, 100u)
-        ->setToolTip("Domain size 2 in number of unit cells");
+    addProperty(P_DOMAIN_SIZE_1, 100u)->setToolTip("Domain size 1 in number of unit cells");
+    addProperty(P_DOMAIN_SIZE_2, 100u)->setToolTip("Domain size 2 in number of unit cells");
 
     mapper()->setOnPropertyChange([this](const QString& name) {
         if (name == P_XI_INTEGRATION && isTag(InterferenceFunction2DLatticeItem::P_LATTICE_TYPE)) {
@@ -312,10 +308,8 @@ InterferenceFunctionHardDiskItem::InterferenceFunctionHardDiskItem()
     : InterferenceFunctionItem("InterferenceHardDisk")
 {
     setToolTip("Interference function for hard disk Percus-Yevick");
-    addProperty(P_RADIUS, 5.0 * Units::nanometer)
-        ->setToolTip("Hard disk radius in nanometers");
-    addProperty(P_DENSITY, 0.002)
-        ->setToolTip("Particle density in particles per square nanometer");
+    addProperty(P_RADIUS, 5.0 * Units::nanometer)->setToolTip("Hard disk radius in nanometers");
+    addProperty(P_DENSITY, 0.002)->setToolTip("Particle density in particles per square nanometer");
 }
 
 std::unique_ptr<IInterferenceFunction>
@@ -347,15 +341,14 @@ InterferenceFunctionRadialParaCrystalItem::InterferenceFunctionRadialParaCrystal
         ->setToolTip("Average distance to the next neighbor in nanometers");
     addProperty(P_DAMPING_LENGTH, 1000.0 * Units::nanometer)
         ->setToolTip("The damping (coherence) length of the paracrystal "
-                                    "in nanometers");
+                     "in nanometers");
     addProperty(P_DOMAIN_SIZE, 0.0)
         ->setToolTip("Size of coherence domain along the lattice main axis "
-                                    "in nanometers");
+                     "in nanometers");
     addProperty(P_KAPPA, 0.0)
         ->setToolTip("Size spacing coupling parameter of the Size Spacing "
-                                    "Correlation Approximation");
-    addGroupProperty(P_PDF, "PDF 1D")
-        ->setToolTip("One-dimensional probability distribution");
+                     "Correlation Approximation");
+    addGroupProperty(P_PDF, "PDF 1D")->setToolTip("One-dimensional probability distribution");
 }
 
 std::unique_ptr<IInterferenceFunction>
diff --git a/GUI/coregui/Models/Lattice2DItems.cpp b/GUI/coregui/Models/Lattice2DItems.cpp
index babe259f0e9cd05abaf57c1c0282a4491ddac558..be935b34ea39c2ffe5fb198e10a7c24aa5c8d1c1 100644
--- a/GUI/coregui/Models/Lattice2DItems.cpp
+++ b/GUI/coregui/Models/Lattice2DItems.cpp
@@ -43,8 +43,7 @@ BasicLatticeItem::BasicLatticeItem() : Lattice2DItem("BasicLattice")
         ->setToolTip("Length of first lattice vector in nanometers");
     addProperty(P_LATTICE_LENGTH2, 20.0)
         ->setToolTip("Length of second lattice vector in nanometers");
-    addProperty(P_LATTICE_ANGLE, 90.0)
-        ->setToolTip("Angle between lattice vectors in degrees");
+    addProperty(P_LATTICE_ANGLE, 90.0)->setToolTip("Angle between lattice vectors in degrees");
     addProperty(Lattice2DItem::P_LATTICE_ROTATION_ANGLE, 0.0)->setToolTip(axis_rotation_tooltip);
 }
 
diff --git a/GUI/coregui/Models/LayerItem.cpp b/GUI/coregui/Models/LayerItem.cpp
index 2c18deae1ae3f8c80f9160ccac82c125866e3c6f..a2fbae90d089c3fa36b24331c26ec6c20b573e45 100644
--- a/GUI/coregui/Models/LayerItem.cpp
+++ b/GUI/coregui/Models/LayerItem.cpp
@@ -43,8 +43,7 @@ LayerItem::LayerItem() : SessionGraphicsItem("Layer")
         ->setLimits(RealLimits::lowerLimited(0.0))
         .setToolTip(layer_nslices_tooltip);
 
-    addGroupProperty(P_ROUGHNESS, "Roughness")
-        ->setToolTip("Roughness of top interface");
+    addGroupProperty(P_ROUGHNESS, "Roughness")->setToolTip("Roughness of top interface");
 
     registerTag(T_LAYOUTS, 0, -1, QStringList() << "ParticleLayout");
     setDefaultTag(T_LAYOUTS);
diff --git a/GUI/coregui/Models/MinimizerItem.cpp b/GUI/coregui/Models/MinimizerItem.cpp
index 1b16458ad487ae0b65eb67d44ec58d1a4326f5ab..fd544658e896e6fcce9f268a0ad9493426b027ff 100644
--- a/GUI/coregui/Models/MinimizerItem.cpp
+++ b/GUI/coregui/Models/MinimizerItem.cpp
@@ -33,8 +33,7 @@ const QString MinimizerContainerItem::P_NORM = "Norm function";
 
 MinimizerContainerItem::MinimizerContainerItem() : MinimizerItem("MinimizerContainer")
 {
-    addGroupProperty(P_MINIMIZERS, "Minimizer library group")
-        ->setToolTip("Minimizer library");
+    addGroupProperty(P_MINIMIZERS, "Minimizer library group")->setToolTip("Minimizer library");
 
     ComboProperty metric_combo;
     for (auto& item : ObjectiveMetricUtils::metricNames())
diff --git a/GUI/coregui/Models/MultiLayerItem.cpp b/GUI/coregui/Models/MultiLayerItem.cpp
index 307daff4d6d303b97c8ca3924ba46c7c68997f14..1ef82cde915d5271e075ef1a4e11ee91a16e9e9e 100644
--- a/GUI/coregui/Models/MultiLayerItem.cpp
+++ b/GUI/coregui/Models/MultiLayerItem.cpp
@@ -34,7 +34,7 @@ MultiLayerItem::MultiLayerItem() : SessionGraphicsItem("MultiLayer")
     addProperty(P_CROSS_CORR_LENGTH, 0.0)
         ->setDecimals(5)
         .setToolTip("Cross correlation length of roughnesses \n"
-                                   "between interfaces in nanometers");
+                    "between interfaces in nanometers");
     addGroupProperty(P_EXTERNAL_FIELD, "Vector")->setToolTip(external_field_tooltip);
 
     registerTag(T_LAYERS, 0, -1, QStringList() << "Layer");
diff --git a/GUI/coregui/Models/ParticleDistributionItem.cpp b/GUI/coregui/Models/ParticleDistributionItem.cpp
index 54df82fac953a1e57fccfce640d1e01a624684b4..44245a71e5c66857c013084ae79553d8d3691f8f 100644
--- a/GUI/coregui/Models/ParticleDistributionItem.cpp
+++ b/GUI/coregui/Models/ParticleDistributionItem.cpp
@@ -40,7 +40,7 @@ const QString ParticleDistributionItem::T_PARTICLES = "Particle Tag";
 ParticleDistributionItem::ParticleDistributionItem() : SessionGraphicsItem("ParticleDistribution")
 {
     setToolTip("Collection of particles obtained via parametric distribution "
-                              "of particle prototype");
+               "of particle prototype");
 
     addProperty(ParticleItem::P_ABUNDANCE, 1.0)
         ->setLimits(RealLimits::limited(0.0, 1.0))
@@ -58,8 +58,7 @@ ParticleDistributionItem::ParticleDistributionItem() : SessionGraphicsItem("Part
     setDefaultTag(T_PARTICLES);
 
     ComboProperty par_prop;
-    addProperty(P_DISTRIBUTED_PARAMETER, par_prop.variant())
-        ->setToolTip("Parameter to distribute");
+    addProperty(P_DISTRIBUTED_PARAMETER, par_prop.variant())->setToolTip("Parameter to distribute");
 
     addProperty(P_LINKED_PARAMETER, par_prop.variant())
         ->setToolTip("Linked parameter")
diff --git a/GUI/coregui/Models/RectangularDetectorItem.cpp b/GUI/coregui/Models/RectangularDetectorItem.cpp
index 64e83e31e70fbbe53123039b85457bab9a2869dd..e1922e89f975ccf9d38c3b44fd5264ae3217b9b2 100644
--- a/GUI/coregui/Models/RectangularDetectorItem.cpp
+++ b/GUI/coregui/Models/RectangularDetectorItem.cpp
@@ -82,16 +82,14 @@ RectangularDetectorItem::RectangularDetectorItem()
     item->getItem(BasicAxisItem::P_MIN_DEG)->setVisible(false);
     item->setItemValue(BasicAxisItem::P_MAX_DEG, default_detector_width);
     item->getItem(BasicAxisItem::P_MAX_DEG)->setDisplayName("Width [mm]");
-    item->getItem(BasicAxisItem::P_MAX_DEG)
-        ->setToolTip("Width of the detector in mm");
+    item->getItem(BasicAxisItem::P_MAX_DEG)->setToolTip("Width of the detector in mm");
 
     item = addGroupProperty(P_Y_AXIS, "BasicAxis");
     item->getItem(BasicAxisItem::P_TITLE)->setVisible(false);
     item->getItem(BasicAxisItem::P_MIN_DEG)->setVisible(false);
     item->setItemValue(BasicAxisItem::P_MAX_DEG, default_detector_height);
     item->getItem(BasicAxisItem::P_MAX_DEG)->setDisplayName("Height [mm]");
-    item->getItem(BasicAxisItem::P_MAX_DEG)
-        ->setToolTip("Height of the detector in mm");
+    item->getItem(BasicAxisItem::P_MAX_DEG)->setToolTip("Height of the detector in mm");
 
     // alignment selector
     addProperty(P_ALIGNMENT, alignmentCombo().variant());
@@ -114,8 +112,7 @@ RectangularDetectorItem::RectangularDetectorItem()
     addProperty(P_DBEAM_V0, 0.0)->setToolTip(tooltip_dbeam_v0).setLimits(RealLimits::limitless());
 
     addProperty(P_DISTANCE, default_detector_distance)
-        ->setToolTip(
-            "Distance in [mm] from the sample origin to the detector plane");
+        ->setToolTip("Distance in [mm] from the sample origin to the detector plane");
 
     register_resolution_function();
 
diff --git a/GUI/coregui/Models/RotationItems.cpp b/GUI/coregui/Models/RotationItems.cpp
index b68cceec7e48348627e2e0b73beb5faf17704b7c..423e1150f5399ed50d20e8398fc03287eb23147f 100644
--- a/GUI/coregui/Models/RotationItems.cpp
+++ b/GUI/coregui/Models/RotationItems.cpp
@@ -23,8 +23,7 @@ const QString XRotationItem::P_ANGLE = "Angle";
 XRotationItem::XRotationItem() : RotationItem("XRotation")
 {
     setToolTip("Particle rotation around x-axis");
-    addProperty(P_ANGLE, 0.0)
-        ->setToolTip("Rotation angle around x-axis in degrees");
+    addProperty(P_ANGLE, 0.0)->setToolTip("Rotation angle around x-axis in degrees");
 }
 
 std::unique_ptr<IRotation> XRotationItem::createRotation() const
@@ -40,8 +39,7 @@ const QString YRotationItem::P_ANGLE = "Angle";
 YRotationItem::YRotationItem() : RotationItem("YRotation")
 {
     setToolTip("Particle rotation around y-axis");
-    addProperty(P_ANGLE, 0.0)
-        ->setToolTip("Rotation angle around y-axis in degrees");
+    addProperty(P_ANGLE, 0.0)->setToolTip("Rotation angle around y-axis in degrees");
 }
 
 std::unique_ptr<IRotation> YRotationItem::createRotation() const
@@ -57,8 +55,7 @@ const QString ZRotationItem::P_ANGLE = "Angle";
 ZRotationItem::ZRotationItem() : RotationItem("ZRotation")
 {
     setToolTip("Particle rotation around z-axis");
-    addProperty(P_ANGLE, 0.0)
-        ->setToolTip("Rotation angle around z-axis in degrees");
+    addProperty(P_ANGLE, 0.0)->setToolTip("Rotation angle around z-axis in degrees");
 }
 
 std::unique_ptr<IRotation> ZRotationItem::createRotation() const
@@ -76,13 +73,10 @@ const QString EulerRotationItem::P_GAMMA = "Gamma";
 EulerRotationItem::EulerRotationItem() : RotationItem("EulerRotation")
 {
     setToolTip("Sequence of three rotations following Euler angles \n"
-                              "notation z-x'-z'");
-    addProperty(P_ALPHA, 0.0)
-        ->setToolTip("First Euler anle in z-x'-z' sequence in degrees");
-    addProperty(P_BETA, 0.0)
-        ->setToolTip("Second Euler anle in z-x'-z' sequence in degrees");
-    addProperty(P_GAMMA, 0.0)
-        ->setToolTip("Third Euler anle in z-x'-z' sequence in degrees");
+               "notation z-x'-z'");
+    addProperty(P_ALPHA, 0.0)->setToolTip("First Euler anle in z-x'-z' sequence in degrees");
+    addProperty(P_BETA, 0.0)->setToolTip("Second Euler anle in z-x'-z' sequence in degrees");
+    addProperty(P_GAMMA, 0.0)->setToolTip("Third Euler anle in z-x'-z' sequence in degrees");
 }
 
 std::unique_ptr<IRotation> EulerRotationItem::createRotation() const
diff --git a/GUI/coregui/Models/SampleValidator.cpp b/GUI/coregui/Models/SampleValidator.cpp
index 377199d28e11850813a38dbef8c622b5e62fca5b..0379fac5807b6cf8344a901eab8b943d7d326e12 100644
--- a/GUI/coregui/Models/SampleValidator.cpp
+++ b/GUI/coregui/Models/SampleValidator.cpp
@@ -126,8 +126,8 @@ bool SampleValidator::isValidMultiLayer(const MultiLayerItem* multilayer)
     iterateItems(multilayer);
 
     if (!m_valid_sample) {
-        m_validation_message = "Can't setup DWBA simulation for given MultiLayer.\n"
-                               + m_validation_message;
+        m_validation_message =
+            "Can't setup DWBA simulation for given MultiLayer.\n" + m_validation_message;
     }
     return m_valid_sample;
 }
diff --git a/GUI/coregui/Models/SessionItem.h b/GUI/coregui/Models/SessionItem.h
index e626eb98c8729656290bef1766b23aa23bf04ec8..0f126ff6eb19d24bd3c59f1d0202554a30a7b76a 100644
--- a/GUI/coregui/Models/SessionItem.h
+++ b/GUI/coregui/Models/SessionItem.h
@@ -50,8 +50,7 @@ public:
     SessionItem* takeRow(int row);
 
     // manage and check tags
-    bool registerTag(const QString& name, int min = 0, int max = -1,
-                     QStringList modelTypes = {});
+    bool registerTag(const QString& name, int min = 0, int max = -1, QStringList modelTypes = {});
     bool isTag(const QString& name) const;
     SessionItemTags* sessionItemTags();
     QString tagFromItem(const SessionItem* item) const;
diff --git a/GUI/coregui/Models/SimulationOptionsItem.cpp b/GUI/coregui/Models/SimulationOptionsItem.cpp
index 90c33865560f765015677cf86f0ba3f76e28806c..34ef0c635e66eafb739aaad500e13cfe37d90fca 100644
--- a/GUI/coregui/Models/SimulationOptionsItem.cpp
+++ b/GUI/coregui/Models/SimulationOptionsItem.cpp
@@ -23,8 +23,7 @@ QStringList getRunPolicyTooltips()
 {
     QStringList result;
     result.append("Start simulation immediately, switch to Jobs view automatically when completed");
-    result.append(
-        "Start simulation immediately, do not switch to Jobs view when completed");
+    result.append("Start simulation immediately, do not switch to Jobs view when completed");
     return result;
 }
 
diff --git a/GUI/coregui/Models/VectorItem.cpp b/GUI/coregui/Models/VectorItem.cpp
index 0301083efddf89479d1dff88e2b04224462c49c1..ee94a8c46901abd9539518e3e7be03c2f660af5f 100644
--- a/GUI/coregui/Models/VectorItem.cpp
+++ b/GUI/coregui/Models/VectorItem.cpp
@@ -20,15 +20,9 @@ const QString VectorItem::P_Z = "Z";
 
 VectorItem::VectorItem() : SessionItem("Vector")
 {
-    addProperty(P_X, 0.0)
-        ->setLimits(RealLimits::limitless())
-        .setToolTip("x-coordinate");
-    addProperty(P_Y, 0.0)
-        ->setLimits(RealLimits::limitless())
-        .setToolTip("y-coordinate");
-    addProperty(P_Z, 0.0)
-        ->setLimits(RealLimits::limitless())
-        .setToolTip("z-coordinate");
+    addProperty(P_X, 0.0)->setLimits(RealLimits::limitless()).setToolTip("x-coordinate");
+    addProperty(P_Y, 0.0)->setLimits(RealLimits::limitless()).setToolTip("y-coordinate");
+    addProperty(P_Z, 0.0)->setLimits(RealLimits::limitless()).setToolTip("z-coordinate");
 
     mapper()->setOnPropertyChange([this](const QString&) { updateLabel(); });
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
index 9e6755bb43b8d3f2ebe0e5004d7e91a44872a019..24c3ddbbb15b54fa9711171ac5a8f6e040dca5fd 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
@@ -133,8 +133,8 @@ void RealDataSelectorActions::importDataLoop(int ndim)
         filter_string_ba = "";
     }
     QString dirname = AppSvc::projectManager()->userImportDir();
-    QStringList fileNames = QFileDialog::getOpenFileNames(
-        Q_NULLPTR, "Open Intensity Files", dirname, filter_string_ba);
+    QStringList fileNames =
+        QFileDialog::getOpenFileNames(Q_NULLPTR, "Open Intensity Files", dirname, filter_string_ba);
 
     if (fileNames.isEmpty())
         return;
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSign.cpp b/GUI/coregui/Views/InfoWidgets/WarningSign.cpp
index b7f1edfaa960bfceb523f1bc59d6fa810b9c81f9..4108629209e7d00cedab7d266e08b0d997bf25ce 100644
--- a/GUI/coregui/Views/InfoWidgets/WarningSign.cpp
+++ b/GUI/coregui/Views/InfoWidgets/WarningSign.cpp
@@ -26,8 +26,8 @@ const int ypos_offset = 40;
 } // namespace
 
 WarningSign::WarningSign(QWidget* parent)
-    : QObject(parent), m_warning_header("Houston, we have a problem."),
-      m_warningWidget(0), m_area(nullptr), m_clear_just_had_happened(false)
+    : QObject(parent), m_warning_header("Houston, we have a problem."), m_warningWidget(0),
+      m_area(nullptr), m_clear_just_had_happened(false)
 {
     setArea(parent);
 }
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
index 6127c486ed71fd12ec201b356bfd6c0d99141ed5..008f27aaf0ccfcd8695c9b8a9ecfe39fc0136860 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
@@ -26,7 +26,7 @@ ParticleDistributionView::ParticleDistributionView(QGraphicsItem* parent) : Conn
         ->setToolTip("Connect to the ParticleLayout");
     addPort("particle", NodeEditorPort::INPUT, NodeEditorPort::FORM_FACTOR)
         ->setToolTip("Connect particle to this port. It will be a prototype \n"
-                                    "for parametric distribution.");
+                     "for parametric distribution.");
 
     m_label_vspace = StyleUtils::SizeOfLetterM().height() * 3.0;
 }
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
index 0765d53bbca9509583d242cb61c71cffdb77d512..36a129cedd9c4c1594c09628aacb8913a5cb68ca 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -25,12 +25,12 @@ ParticleLayoutView::ParticleLayoutView(QGraphicsItem* parent) : ConnectableView(
     setRectangle(DesignerHelper::getParticleLayoutBoundingRect());
     addPort("out", NodeEditorPort::OUTPUT, NodeEditorPort::PARTICLE_LAYOUT)
         ->setToolTip("Connect this port with the layer "
-                                    "to populate it with particles");
+                     "to populate it with particles");
     addPort("particle", NodeEditorPort::INPUT, NodeEditorPort::FORM_FACTOR)
         ->setToolTip("Connect one or several particles to this port");
     addPort("interference", NodeEditorPort::INPUT, NodeEditorPort::INTERFERENCE)
         ->setToolTip("Connect interference to this port "
-                                    "to have coherent scattering");
+                     "to have coherent scattering");
 }
 
 void ParticleLayoutView::addView(IView* childView, int /* row */)
diff --git a/GUI/coregui/Views/widgetbox/widgetboxcategorylistview.cpp b/GUI/coregui/Views/widgetbox/widgetboxcategorylistview.cpp
index 5d824f23ef8dbfd392a22154668d35d10aef83c7..6dac21597c43ca05c90d3dc19ad357d375581385 100644
--- a/GUI/coregui/Views/widgetbox/widgetboxcategorylistview.cpp
+++ b/GUI/coregui/Views/widgetbox/widgetboxcategorylistview.cpp
@@ -237,8 +237,7 @@ void WidgetBoxCategoryModel::addWidget(const QDesignerWidgetBoxInterface::Widget
 {
     // build item. Filter on name + class name if it is different and not a layout.
     QString filter = widget.name();
-    if (!filter.contains("Layout")
-        && m_classNameRegExp.indexIn(widget.domXml()) != -1) {
+    if (!filter.contains("Layout") && m_classNameRegExp.indexIn(widget.domXml()) != -1) {
         const QString className = m_classNameRegExp.cap(1);
         if (!filter.contains(className))
             filter += className;
diff --git a/Tests/Functional/Core/Std/Check.cpp b/Tests/Functional/Core/Std/Check.cpp
index e7a1a06ad7fa2f210b5222ba0f856747de3ccaa0..3ad665b8337046042a98f5bbfceb2f762cf09394 100644
--- a/Tests/Functional/Core/Std/Check.cpp
+++ b/Tests/Functional/Core/Std/Check.cpp
@@ -36,18 +36,16 @@ bool checkSimulation(const std::string& name, const Simulation& direct_simulatio
     assert(name != "");
     try {
         reference.reset(IntensityDataIOFactory::readOutputData(
-                            FileSystemUtils::jointPath(BATesting::StdReferenceDir(), name + ".int.gz")));
+            FileSystemUtils::jointPath(BATesting::StdReferenceDir(), name + ".int.gz")));
     } catch (const std::exception&) {
-        std::cout
-            << "No reference found, but we proceed with the simulation to create a new one\n";
+        std::cout << "No reference found, but we proceed with the simulation to create a new one\n";
     }
 
     // Compare with reference if available.
     bool success = false;
     if (reference) {
         std::cout << "- check diff" << std::endl;
-        success =
-            IntensityDataFunctions::checkRelativeDifference(*reference, *result_data, limit);
+        success = IntensityDataFunctions::checkRelativeDifference(*reference, *result_data, limit);
     }
 
     // Save simulation if different from reference.
diff --git a/Tests/Functional/GUI/Std/macros.cpp b/Tests/Functional/GUI/Std/macros.cpp
index 43e3e119d34a821ebae4abd0275f168e5a2fc194..588d89cd01df3b0fe6d2d834d287659e9a50485f 100644
--- a/Tests/Functional/GUI/Std/macros.cpp
+++ b/Tests/Functional/GUI/Std/macros.cpp
@@ -14,5 +14,5 @@
 
 #include "Tests/Functional/Std/Run.h"
 
-#define  GUI_STD_TEST
+#define GUI_STD_TEST
 #include "Tests/Functional/Std/StandardTests.h" // contains macros that are executed by gtest
diff --git a/Tests/Functional/Python/Std/macros.cpp b/Tests/Functional/Python/Std/macros.cpp
index 2612de48a605ddd9419b614214cd86b375191693..5961e64030f232c36d8da701721b43917dd8d31a 100644
--- a/Tests/Functional/Python/Std/macros.cpp
+++ b/Tests/Functional/Python/Std/macros.cpp
@@ -14,5 +14,5 @@
 
 #include "Tests/Functional/Std/Run.h"
 
-#define  PYTHON_STD_TEST
+#define PYTHON_STD_TEST
 #include "Tests/Functional/Std/StandardTests.h" // contains macros that are executed by gtest
diff --git a/Tests/Functional/Std/StandardTests.h b/Tests/Functional/Std/StandardTests.h
index 03ab19b8731aa61ca74170ab944be86e1a9e84b3..ad28074a85985b68e6a9c172c4fb9b89a199b622 100644
--- a/Tests/Functional/Std/StandardTests.h
+++ b/Tests/Functional/Std/StandardTests.h
@@ -410,7 +410,6 @@ TEST_F(Std, SpecularDivergentBeam)
                     "HomogeneousMultilayerBuilder", 1e-10));
 }
 
-
 // ************************************************************************** //
 // TODO: broken under GUI
 // ************************************************************************** //
@@ -425,7 +424,6 @@ TEST_F(Std, RelativeResolutionTOF)
 
 #endif // GUI_STD_TEST
 
-
 // ************************************************************************** //
 // TODO: broken under Python
 // ************************************************************************** //
@@ -444,7 +442,6 @@ TEST_F(Std, FormFactorsWithAbsorption)
 }
 #endif // PYTHON_STD_TEST
 
-
 // ************************************************************************** //
 // TODO: broken under GUI and Python
 // ************************************************************************** //