diff --git a/GUI/Model/Data/RealItem.cpp b/GUI/Model/Data/RealItem.cpp
index 260b7145ae6e1388318829d792f6956449663b9b..c484fb7c0c287f15a6b4584a01e9ddc368c99975 100644
--- a/GUI/Model/Data/RealItem.cpp
+++ b/GUI/Model/Data/RealItem.cpp
@@ -399,8 +399,7 @@ void RealItem::readFrom(QXmlStreamReader* r)
         if (tag == Tag::BinaryData) {
             const uint binary_version = XML::readUIntAttribute(r, XML::Attrib::binary_version);
             if (binary_version == 1) {
-                QString valueAsBase64 =
-                    r->readElementText(QXmlStreamReader::SkipChildElements);
+                QString valueAsBase64 = r->readElementText(QXmlStreamReader::SkipChildElements);
                 const auto data = QByteArray::fromBase64(
                     valueAsBase64.toLatin1()); // #baimport add a unit test for this!
                 deserializeBinaryData(data);
diff --git a/GUI/Model/Device/SpecularBeamInclinationItem.cpp b/GUI/Model/Device/SpecularBeamInclinationItem.cpp
index 378aac645259999e0aefa6c0ce56f62cc8fa7f57..b52a1287c4847b7eeffc3eda9c4899ba7e25fece 100644
--- a/GUI/Model/Device/SpecularBeamInclinationItem.cpp
+++ b/GUI/Model/Device/SpecularBeamInclinationItem.cpp
@@ -131,7 +131,7 @@ void SpecularBeamInclinationItem::readFrom(QXmlStreamReader* r)
             XML::readAttribute(r, XML::Attrib::value, &m_currentAxisIsUniformAxis);
             XML::gotoEndElementOfTag(r, tag);
 
-        // uniform axis
+            // uniform axis
         } else if (tag == Tag::UniformAxis) {
             m_uniformAlphaAxis = std::make_unique<BasicAxisItem>();
             setAxisPresentationDefaults(m_uniformAlphaAxis.get());
diff --git a/GUI/Model/Job/FitParameterItem.cpp b/GUI/Model/Job/FitParameterItem.cpp
index 7538fab8d691df88b5443c728df790421bf72206..35d590695b0f731e182d195ac94a80af478bbe35 100644
--- a/GUI/Model/Job/FitParameterItem.cpp
+++ b/GUI/Model/Job/FitParameterItem.cpp
@@ -145,13 +145,13 @@ void FitEditableDoubleItem::readFrom(QXmlStreamReader* r)
             FitDoubleItem::readFrom(r);
             XML::gotoEndElementOfTag(r, tag);
 
-        // is enabled?
+            // is enabled?
         } else if (tag == Tag::IsEnabled) {
             XML::readAttribute(r, XML::Attrib::value, &m_isEnabled);
             XML::gotoEndElementOfTag(r, tag);
 
         } else
-             r->skipCurrentElement();
+            r->skipCurrentElement();
     }
 }
 
diff --git a/GUI/Model/Job/FitParameterItem.h b/GUI/Model/Job/FitParameterItem.h
index 762b3d4f3ed376b10e04c0ab695e466e261806a0..3f23908dcf223596916fb049dd63729eada6e06e 100644
--- a/GUI/Model/Job/FitParameterItem.h
+++ b/GUI/Model/Job/FitParameterItem.h
@@ -26,14 +26,8 @@ class FitTypeItem : public QObject {
 public:
     explicit FitTypeItem(const ComboProperty& type, QObject* parent = nullptr);
 
-    const ComboProperty& type() const
-    {
-        return m_type;
-    }
-    void setType(const ComboProperty& c)
-    {
-        m_type = c;
-    }
+    const ComboProperty& type() const { return m_type; }
+    void setType(const ComboProperty& c) { m_type = c; }
 
     void writeTo(QXmlStreamWriter* w) const;
     void readFrom(QXmlStreamReader* r);
@@ -47,32 +41,14 @@ class FitDoubleItem : public QObject {
 public:
     explicit FitDoubleItem(double value, QObject* parent = nullptr);
 
-    double value() const
-    {
-        return m_value;
-    }
-    void setValue(double value)
-    {
-        m_value = value;
-    }
-
-    const RealLimits& limits() const
-    {
-        return m_limits;
-    }
-    void setLimits(const RealLimits& l)
-    {
-        m_limits = l;
-    }
-
-    int decimals() const
-    {
-        return m_decimals;
-    }
-    void setDecimals(int v)
-    {
-        m_decimals = v;
-    }
+    double value() const { return m_value; }
+    void setValue(double value) { m_value = value; }
+
+    const RealLimits& limits() const { return m_limits; }
+    void setLimits(const RealLimits& l) { m_limits = l; }
+
+    int decimals() const { return m_decimals; }
+    void setDecimals(int v) { m_decimals = v; }
 
     virtual void writeTo(QXmlStreamWriter* w) const;
     virtual void readFrom(QXmlStreamReader* r);
@@ -89,14 +65,8 @@ class FitEditableDoubleItem : public FitDoubleItem {
 public:
     explicit FitEditableDoubleItem(double value, bool isEnabled, QObject* parent = nullptr);
 
-    bool isEnabled() const
-    {
-        return m_isEnabled;
-    }
-    void setEnabled(bool b)
-    {
-        m_isEnabled = b;
-    }
+    bool isEnabled() const { return m_isEnabled; }
+    void setEnabled(bool b) { m_isEnabled = b; }
 
     void writeTo(QXmlStreamWriter* w) const override;
     void readFrom(QXmlStreamReader* r) override;
diff --git a/GUI/Model/Job/FitParameterLinkItem.h b/GUI/Model/Job/FitParameterLinkItem.h
index 5175474268d6a83f9d3c0175050361210a554d64..6eac58ac1aa40a27cfe8278aa872a4147b46962d 100644
--- a/GUI/Model/Job/FitParameterLinkItem.h
+++ b/GUI/Model/Job/FitParameterLinkItem.h
@@ -25,14 +25,8 @@ class LinkItem : public QObject {
 public:
     explicit LinkItem(QObject* parent = nullptr);
 
-    QString link() const
-    {
-        return m_link;
-    }
-    void setLink(QString link)
-    {
-        m_link = link;
-    }
+    QString link() const { return m_link; }
+    void setLink(QString link) { m_link = link; }
 
     void writeTo(QXmlStreamWriter* w) const;
     void readFrom(QXmlStreamReader* r);
@@ -47,27 +41,12 @@ class FitParameterLinkItem : public QObject {
 public:
     explicit FitParameterLinkItem(QObject* parent = nullptr);
 
-    QString link() const
-    {
-        return m_linkItem->link();
-    }
-    void setLink(const QString& l)
-    {
-        m_linkItem->setLink(l);
-    }
+    QString link() const { return m_linkItem->link(); }
+    void setLink(const QString& l) { m_linkItem->setLink(l); }
 
-    QString title() const
-    {
-        return m_title;
-    }
-    void setTitle(const QString& t)
-    {
-        m_title = t;
-    }
-    LinkItem* linkItem() const
-    {
-        return m_linkItem;
-    }
+    QString title() const { return m_title; }
+    void setTitle(const QString& t) { m_title = t; }
+    LinkItem* linkItem() const { return m_linkItem; }
 
     void writeTo(QXmlStreamWriter* w) const;
     void readFrom(QXmlStreamReader* r);
diff --git a/GUI/Model/Job/ParameterTreeItems.cpp b/GUI/Model/Job/ParameterTreeItems.cpp
index 98c137f567228a56cae421f65825007d4eb1f789..d9d32af6b5d4a8742f7d58bc3ffe1aaa90297ef7 100644
--- a/GUI/Model/Job/ParameterTreeItems.cpp
+++ b/GUI/Model/Job/ParameterTreeItems.cpp
@@ -169,7 +169,7 @@ void ParameterContainerItem::readFrom(QXmlStreamReader* r)
             while (r->readNextStartElement()) {
                 QString backupTag = r->name().toString();
 
-                if(backupTag == Tag::BackupValue) {
+                if (backupTag == Tag::BackupValue) {
                     QString link;
                     double d;
                     XML::readAttribute(r, XML::Attrib::id, &link);