diff --git a/GUI/View/Data/IntensityDataPropertyWidget.cpp b/GUI/View/Data/IntensityDataPropertyWidget.cpp
index 33f9a4698142b9c092b1d909cb5dfbda0deba300..9cdc62db790aa604a9d7974f20c07e806e5c7951 100644
--- a/GUI/View/Data/IntensityDataPropertyWidget.cpp
+++ b/GUI/View/Data/IntensityDataPropertyWidget.cpp
@@ -21,6 +21,9 @@
 #include "GUI/Support/Tool/LayoutUtil.h"
 #include "GUI/View/Numeric/ComboUtil.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
+#include <QCheckBox>
+#include <QDoubleSpinBox>
+#include <QFormLayout>
 #include <QGroupBox>
 #include <QLineEdit>
 
diff --git a/GUI/View/Device/AxisPropertyForm.cpp b/GUI/View/Device/AxisPropertyForm.cpp
index 0cfcdee3f8f460c40be47ab65a5dc14d8c03a621..464951aedf8c3a9bf141c857d5cd60c3cf367c82 100644
--- a/GUI/View/Device/AxisPropertyForm.cpp
+++ b/GUI/View/Device/AxisPropertyForm.cpp
@@ -17,6 +17,7 @@
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
+#include <QFormLayout>
 
 AxisPropertyForm::AxisPropertyForm(QWidget* parent, const QString& groupTitle,
                                    AxisProperty* axisProperty, QString nbinsTooltip)
diff --git a/GUI/View/FitControl/FitObjectiveBuilder.cpp b/GUI/View/FitControl/FitObjectiveBuilder.cpp
index 28ab58820645135d59530f8802a92bdb8ef5419c..39bf50cde33d0fd26805875eebff78613ccf8481 100644
--- a/GUI/View/FitControl/FitObjectiveBuilder.cpp
+++ b/GUI/View/FitControl/FitObjectiveBuilder.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/FitControl/FitObjectiveBuilder.cpp
-//! @brief     Implements class SimulationBuilder
+//! @brief     Implements class FitObjectiveBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/View/FitControl/MinimizerSettingsWidget.cpp b/GUI/View/FitControl/MinimizerSettingsWidget.cpp
index 67e6d9182f0dffc51bd42cdbc85d9adf314d27d9..294e9773651a6ab61c0df361616a40e105cb9d67 100644
--- a/GUI/View/FitControl/MinimizerSettingsWidget.cpp
+++ b/GUI/View/FitControl/MinimizerSettingsWidget.cpp
@@ -19,6 +19,8 @@
 #include "GUI/Support/Tool/LayoutUtil.h"
 #include "GUI/View/Numeric/ComboUtil.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
+#include <QFormLayout>
+#include <QSpinBox>
 #include <QStandardItemModel>
 
 MinimizerSettingsWidget::MinimizerSettingsWidget(QWidget* parent)
diff --git a/GUI/View/Info/MessageBox.cpp b/GUI/View/Info/MessageBox.cpp
index e46512f75e3cfb4ef13d73cd22e01b6af66aaebe..4286f949b35b942a43d7c561373cf7183947ffc8 100644
--- a/GUI/View/Info/MessageBox.cpp
+++ b/GUI/View/Info/MessageBox.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Info/MessageBox.cpp
-//! @brief     Implements GUIHelpers functions
+//! @brief     Implements namespace GUI::Message
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/View/Info/MessageBox.h b/GUI/View/Info/MessageBox.h
index 7dc82c7382a0ff0634ebef6232f2067998e68f99..7264c60b4c7270bd4d7e26d73280bc0c4c7e182a 100644
--- a/GUI/View/Info/MessageBox.h
+++ b/GUI/View/Info/MessageBox.h
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Info/MessageBox.h
-//! @brief     Defines class GUIHelpers functions
+//! @brief     Declares namespace GUI::Message
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/View/Info/PythonSyntaxHighlighter.cpp b/GUI/View/Info/PythonSyntaxHighlighter.cpp
index 5437981e7056253b2f43207a194fa4e5aedddc01..fb4cfd0320b1b904402d2074130e52f5bb51d3a5 100644
--- a/GUI/View/Info/PythonSyntaxHighlighter.cpp
+++ b/GUI/View/Info/PythonSyntaxHighlighter.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Info/PythonSyntaxHighlighter.cpp
-//! @brief     Defines class PythonSyntaxHighlighter
+//! @brief     Implements class PythonSyntaxHighlighter
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index 97a2df42d022336f8b1b7816a78fcc07fcee50f3..2933b868048f71c4232a64edbb1a3da1f7a34666 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Instrument/DistributionEditor.cpp
-//! @brief     Implements classes DistributionSelector and DistributionEditor
+//! @brief     Implements class DistributionEditor
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/View/Instrument/DistributionEditor.h b/GUI/View/Instrument/DistributionEditor.h
index 6ad40479925fcfdfd3ad446b89adb33b4362b7ae..a6727d37b5ddb4032b9604a0e418cc69f703e2ad 100644
--- a/GUI/View/Instrument/DistributionEditor.h
+++ b/GUI/View/Instrument/DistributionEditor.h
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Instrument/DistributionEditor.h
-//! @brief     A widget for selecting a distribution and setting its parameters.
+//! @brief     Defines class DistributionEditor
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -22,7 +22,6 @@
 
 class BeamDistributionItem;
 class DistributionPlot;
-class DoubleSpinBox;
 
 //! DistributionSelector contained in a GroupBox with a title and a button
 //! to open the distribution dialog
diff --git a/GUI/View/Instrument/DistributionSelector.cpp b/GUI/View/Instrument/DistributionSelector.cpp
index f2bec183c0b31bf4bbdfe740abb53b175f84c51e..f603a69ff39ad5c4c420bd4fb9067c37408069be 100644
--- a/GUI/View/Instrument/DistributionSelector.cpp
+++ b/GUI/View/Instrument/DistributionSelector.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Instrument/DistributionSelector.cpp
-//! @brief     Implements classes DistributionSelector.
+//! @brief     Implements class DistributionSelector
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/View/Instrument/DistributionSelector.h b/GUI/View/Instrument/DistributionSelector.h
index dc3f94cf7b7a9871b23aa54a51be6961046ca811..edace3aa496ca8e1fde5858bd8c4f6cb98f8b85b 100644
--- a/GUI/View/Instrument/DistributionSelector.h
+++ b/GUI/View/Instrument/DistributionSelector.h
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Instrument/DistributionSelector.h
-//! @brief     A widget for selecting a distribution and setting its parameters
+//! @brief     Defines struct MeanConfig and class DistributionSelector
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/View/Instrument/OffspecDetectorEditor.cpp b/GUI/View/Instrument/OffspecDetectorEditor.cpp
index d6625057d90fcca0def25114f372bdf8813b9699..b655f9dedee767b81dcd10bcfe9ec9ab4ddb4b30 100644
--- a/GUI/View/Instrument/OffspecDetectorEditor.cpp
+++ b/GUI/View/Instrument/OffspecDetectorEditor.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Instrument/OffspecDetectorEditor.cpp
-//! @brief     Implements class DetectorEditor
+//! @brief     Implements class OffspecDetectorEditor
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/View/Instrument/OffspecDetectorEditor.h b/GUI/View/Instrument/OffspecDetectorEditor.h
index dec2f40b56919dd993e1e7dc80b26dd4045e8f1a..c6af9f3d72b71cee352ce0253ddd7e0d1cb67b69 100644
--- a/GUI/View/Instrument/OffspecDetectorEditor.h
+++ b/GUI/View/Instrument/OffspecDetectorEditor.h
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Instrument/OffspecDetectorEditor.h
-//! @brief     Defines class DetectorEditor
+//! @brief     Defines class OffspecDetectorEditor
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
index d9dad508ae46cbe8d2d07c63df1c993839e4d309..8b857d9141155908f2388ed6e608ba5b987ef7dc 100644
--- a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
+++ b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
@@ -17,6 +17,7 @@
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
+#include <QCheckBox>
 #include <QLabel>
 
 PolarizationAnalysisEditor::PolarizationAnalysisEditor(QWidget* parent, InstrumentItem* instrument)
diff --git a/GUI/View/Numeric/ComboUtil.cpp b/GUI/View/Numeric/ComboUtil.cpp
index 34854e5287fb886906b850af51a54fdc039fbed9..6881faff838de8de839199211698fd40b653e9fc 100644
--- a/GUI/View/Numeric/ComboUtil.cpp
+++ b/GUI/View/Numeric/ComboUtil.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Numeric/ComboUtil.cpp
-//! @brief     Implements functions in GUI::Util namespace
+//! @brief     Implements combo functions in namespace GUI::Util
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/View/Numeric/ComboUtil.h b/GUI/View/Numeric/ComboUtil.h
index 34f6ea8df5738118a5bf18de73a2bbc1bc9a3fa0..348b8a66ad3feade392588cb0f08c3669818ff89 100644
--- a/GUI/View/Numeric/ComboUtil.h
+++ b/GUI/View/Numeric/ComboUtil.h
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Numeric/ComboUtil.h
-//! @brief     Defines functions in GUI::Util namespace
+//! @brief     Declares combo functions in namespace GUI::Util, implements templated function
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/View/Numeric/FixupDoubleValidator.cpp b/GUI/View/Numeric/FixupDoubleValidator.cpp
index 3e74683043ae2e2709bea9bcbb1d54f37954e0bf..f07c87f70839a05f5df4796b7f0568788dc0dc17 100644
--- a/GUI/View/Numeric/FixupDoubleValidator.cpp
+++ b/GUI/View/Numeric/FixupDoubleValidator.cpp
@@ -1,3 +1,17 @@
+//  ************************************************************************************************
+//
+//  BornAgain: simulate and fit reflection and scattering
+//
+//! @file      GUI/View/Numeric/FixupDoubleValidator.cpp
+//! @brief     Implements class FixupDoubleValidator
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+//  ************************************************************************************************
+
 #include "FixupDoubleValidator.h"
 
 FixupDoubleValidator::FixupDoubleValidator(QObject* parent)
diff --git a/GUI/View/Numeric/NumWidgetUtil.cpp b/GUI/View/Numeric/NumWidgetUtil.cpp
index f028bd638300beaa03290a6c97c5fc2c3772607d..308e65f8b27a1143c50aac6fc15fc8bd63820676 100644
--- a/GUI/View/Numeric/NumWidgetUtil.cpp
+++ b/GUI/View/Numeric/NumWidgetUtil.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Numeric/NumWidgetUtil.cpp
-//! @brief     Implements functions in GUI::Util namespace
+//! @brief     Implements widget functions in namespace GUI::Util
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/View/Numeric/NumWidgetUtil.h b/GUI/View/Numeric/NumWidgetUtil.h
index 10f6da975b72f5a722c47bea03c5625aa1249d9a..8b15fd42fd2d688ccf1dfee401d82c5db03929bd 100644
--- a/GUI/View/Numeric/NumWidgetUtil.h
+++ b/GUI/View/Numeric/NumWidgetUtil.h
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Numeric/NumWidgetUtil.h
-//! @brief     Defines functions in GUI::Util namespace
+//! @brief     Declares widget functions in namespace GUI::Util
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -16,12 +16,15 @@
 #define BORNAGAIN_GUI_VIEW_NUMERIC_NUMWIDGETUTIL_H
 
 #include "Fit/Param/RealLimits.h"
-#include <QCheckBox>
-#include <QFormLayout>
-#include <QSpinBox>
+#include <QString>
 
 class DoubleSpinBox;
 class DoubleProperty;
+class QCheckBox;
+class QDoubleSpinBox;
+class QFormLayout;
+class QSpinBox;
+class RealLimits;
 class ScientificSpinBox;
 
 namespace GUI::Util {
@@ -64,7 +67,7 @@ QCheckBox* createCheckBox(const QString& title, std::function<bool()> getter,
 //! scrollable form - unintended and unnoticed changes would take place when just scrolling through
 //! the form.
 QSpinBox* createIntSpinbox(std::function<int()> getter, std::function<void(int)> slot,
-                           const RealLimits& limits = RealLimits(), QString tooltip = "",
+                           const RealLimits& limits = {}, QString tooltip = "",
                            QList<std::function<void()>>* updaters = nullptr,
                            bool easyScrollable = false);
 
@@ -72,7 +75,7 @@ QSpinBox* createIntSpinbox(std::function<int()> getter, std::function<void(int)>
 QDoubleSpinBox* createDoubleSpinbox(std::function<double()> getter,
                                     std::function<void(double)> slot,
                                     QList<std::function<void()>>* updaters, QString tooltip = "",
-                                    const RealLimits& limits = RealLimits(),
+                                    const RealLimits& limits = {},
                                     bool easyScrollable = true);
 } // namespace GUI::Util
 
diff --git a/GUI/View/Numeric/NumberUtil.cpp b/GUI/View/Numeric/NumberUtil.cpp
index 1a1e424c9a903d92f2a444fe539f83377fc52c11..da96fed596d0b9135ab6fc6484a27d8d60daacc4 100644
--- a/GUI/View/Numeric/NumberUtil.cpp
+++ b/GUI/View/Numeric/NumberUtil.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Numeric/NumberUtil.cpp
-//! @brief     Implements GUIHelpers functions
+//! @brief     Implements namespace GUI::View::NumberUtil
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/View/Numeric/NumberUtil.h b/GUI/View/Numeric/NumberUtil.h
index a17ccd47f400bc0eaad61b34996291b0e0ab8507..3c27611a41050baaa9ee3d8e6ac9d179b03fbff7 100644
--- a/GUI/View/Numeric/NumberUtil.h
+++ b/GUI/View/Numeric/NumberUtil.h
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/View/Numeric/NumberUtil.h
-//! @brief     Defines class GUIHelpers functions
+//! @brief     Declares namespace GUI::View::NumberUtil
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)