diff --git a/core/include/Data/DataSeriesUtils.h b/core/include/Data/DataSeriesUtils.h
index e696345..c8b5504 100644
--- a/core/include/Data/DataSeriesUtils.h
+++ b/core/include/Data/DataSeriesUtils.h
@@ -5,8 +5,8 @@
 
 #include <Data/DataSeriesIterator.h>
 
-#include <cmath>
 #include <QLoggingCategory>
+#include <cmath>
 
 Q_DECLARE_LOGGING_CATEGORY(LOG_DataSeriesUtils)
 
diff --git a/gui/meson.build b/gui/meson.build
index 82ce47c..8b59a21 100644
--- a/gui/meson.build
+++ b/gui/meson.build
@@ -17,7 +17,7 @@ gui_moc_headers = [
   'include/Visualization/VisualizationZoneWidget.h',
   'include/Visualization/VisualizationDragDropContainer.h',
   'include/Visualization/VisualizationDragWidget.h',
-  'include/Visualization/ColorScaleWidget.h'
+  'include/Visualization/ColorScaleEditor.h'
 ]
 
 gui_ui_files = [
@@ -33,7 +33,7 @@ gui_ui_files = [
   'ui/Visualization/VisualizationTabWidget.ui',
   'ui/Visualization/VisualizationWidget.ui',
   'ui/Visualization/VisualizationZoneWidget.ui',
-  'ui/Visualization/ColorScaleWidget.ui'
+  'ui/Visualization/ColorScaleEditor.ui'
 ]
 
 gui_qresources = ['resources/sqpguiresources.qrc']
@@ -80,7 +80,7 @@ gui_sources = [
   'src/Visualization/PlottablesRenderingUtils.cpp',
   'src/Visualization/MacScrollBarStyle.cpp',
   'src/Visualization/VisualizationCursorItem.cpp',
-  'src/Visualization/ColorScaleWidget.cpp',
+  'src/Visualization/ColorScaleEditor.cpp',
   'src/Visualization/SqpColorScale.cpp'
 ]
 
diff --git a/gui/src/Visualization/ColorScaleEditor.cpp b/gui/src/Visualization/ColorScaleEditor.cpp
index 81f271b..27ed864 100644
--- a/gui/src/Visualization/ColorScaleEditor.cpp
+++ b/gui/src/Visualization/ColorScaleEditor.cpp
@@ -23,8 +23,8 @@ const auto GRADIENTS = QVariantMap{{"Candy", QCPColorGradient::gpCandy},
 ColorScaleEditor::ColorScaleEditor(SqpColorScale &scale, QWidget *parent)
         : QDialog{parent},
           ui{new Ui::ColorScaleEditor},
-          m_Scale{scale},
-          m_ThresholdGroup{new QButtonGroup{this}}
+          m_ThresholdGroup{new QButtonGroup{this}},
+          m_Scale{scale}
 {
     ui->setupUi(this);