diff --git a/GUI/View/Instrument/AlphaScanEditor.cpp b/GUI/View/Instrument/AlphaScanEditor.cpp
index af46f9ebafdd778a67194a2c054fca73e0526b4d..eecbfd42b3ff497515210c55d14554bb7f0bb1a9 100644
--- a/GUI/View/Instrument/AlphaScanEditor.cpp
+++ b/GUI/View/Instrument/AlphaScanEditor.cpp
@@ -16,8 +16,8 @@
 #include "GUI/Model/Beam/GrazingScanItem.h"
 #include "GUI/Model/Descriptor/DistributionItems.h"
 #include "GUI/View/Device/SphericalAxisForm.h"
-#include "GUI/View/Instrument/DistributionSelector.h"
 #include "GUI/View/Instrument/DistributionPlot.h"
+#include "GUI/View/Instrument/DistributionSelector.h"
 
 AlphaScanEditor::AlphaScanEditor(QWidget* parent, GrazingScanItem* item, bool allow_distr)
     : CollapsibleGroupBox("Grazing angles (deg)", parent, item->expandGroupBox)
diff --git a/GUI/View/Instrument/DetectorEditor.cpp b/GUI/View/Instrument/DetectorEditor.cpp
index f29bf39fa303e64ce93373c7a10759f0a8bf5051..212a7410d6fa1997850f2ba9985a94b07b306007 100644
--- a/GUI/View/Instrument/DetectorEditor.cpp
+++ b/GUI/View/Instrument/DetectorEditor.cpp
@@ -155,15 +155,16 @@ DetectorEditor::DetectorEditor(QWidget* parent, GISASInstrumentItem* instrItem)
     auto* aliLine = new QHBoxLayout;
     layout->addLayout(aliLine);
 
-    QFormLayout* alignmentForm = new QFormLayout;
-    aliLine->addLayout(alignmentForm);
-    alignmentForm->addRow("Alignment:",
-                          GUI::Util::createSafeComboBox(
-                              [detectorItem] { return detectorItem->detectorAlignmentCombo(); },
-                              [this, detectorItem](const QString& t) {
-                                  detectorItem->setDetectorAlignment(t);
-                                  emit dataChanged();
-                              }));
+    auto* aliForm = new QFormLayout;
+    aliLine->addLayout(aliForm);
+
+    auto* aliCombo = GUI::Util::createSafeComboBox(
+        [detectorItem] { return detectorItem->detectorAlignmentCombo(); },
+        [this, detectorItem](const QString& t) {
+            detectorItem->setDetectorAlignment(t);
+            emit dataChanged();
+        });
+    aliForm->addRow("Alignment:", aliCombo);
 
     auto* detposLayout = new QFormLayout;
     aliLine->addLayout(detposLayout);
diff --git a/GUI/View/Instrument/DistributionEditor.h b/GUI/View/Instrument/DistributionEditor.h
index d64df0173103b9cc2eb882293a06d68a2d331801..95e096efed7993a247d88fdee7e3321772a2bac3 100644
--- a/GUI/View/Instrument/DistributionEditor.h
+++ b/GUI/View/Instrument/DistributionEditor.h
@@ -15,8 +15,8 @@
 #ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_DISTRIBUTIONEDITOR_H
 #define BORNAGAIN_GUI_VIEW_INSTRUMENT_DISTRIBUTIONEDITOR_H
 
-#include "GUI/View/Instrument/DistributionSelector.h" // MeanConfig
 #include "GUI/Support/Data/ID.h"
+#include "GUI/View/Instrument/DistributionSelector.h" // MeanConfig
 #include "GUI/View/Widget/GroupBoxes.h"
 #include <optional>
 
diff --git a/GUI/View/Instrument/DistributionSelector.h b/GUI/View/Instrument/DistributionSelector.h
index 8f22f2db7641da124c5c3c3736874d85515fad12..dc3f94cf7b7a9871b23aa54a51be6961046ca811 100644
--- a/GUI/View/Instrument/DistributionSelector.h
+++ b/GUI/View/Instrument/DistributionSelector.h
@@ -16,8 +16,8 @@
 #define BORNAGAIN_GUI_VIEW_INSTRUMENT_DISTRIBUTIONSELECTOR_H
 
 #include "GUI/Support/Data/ID.h"
-#include <optional>
 #include <QWidget>
+#include <optional>
 
 class BeamDistributionItem;
 class DistributionItem;
diff --git a/GUI/View/Instrument/ScanEditor.cpp b/GUI/View/Instrument/ScanEditor.cpp
index 318b83ffaa5bae639393a304d0711f868dfb25a0..81baff39f4abf64313aed018caf263402face4fe 100644
--- a/GUI/View/Instrument/ScanEditor.cpp
+++ b/GUI/View/Instrument/ScanEditor.cpp
@@ -46,9 +46,9 @@ ScanEditor::ScanEditor(QWidget* parent, ScanItem* item, InstrumentNotifier* ec,
     auto* hLayout = new QHBoxLayout;
     layout->addLayout(hLayout);
 
-    auto* wavelengthEditor =
-        new DistributionEditor("Wavelength (nm)", MeanConfig{true}, GUI::ID::Distributions::Symmetric,
-                               this, item->wavelengthItem(), allow_distr);
+    auto* wavelengthEditor = new DistributionEditor("Wavelength (nm)", MeanConfig{true},
+                                                    GUI::ID::Distributions::Symmetric, this,
+                                                    item->wavelengthItem(), allow_distr);
     hLayout->addWidget(wavelengthEditor);
 
     auto* inclinationEditor = new AlphaScanEditor(this, item->grazingScanItem(), allow_distr);