diff --git a/Core/Algorithms/ChiSquaredModule.cpp b/Core/Algorithms/ChiSquaredModule.cpp
index 0c44f78d8626cb8f225835d789dde693ac007f9a..5c1f2dc71171250254c231b2458e6456ccc24933 100644
--- a/Core/Algorithms/ChiSquaredModule.cpp
+++ b/Core/Algorithms/ChiSquaredModule.cpp
@@ -181,6 +181,5 @@ void ChiSquaredModule::processFitElements(std::vector<FitElement>::iterator firs
         double residual = std::sqrt(weight)*(value_simu - value_real)/std::sqrt(squared_error);
 
         it->setResidual(residual);
-
     }
 }
diff --git a/Core/Tools/OutputData.cpp b/Core/Tools/OutputData.cpp
index a766887e114d2f7b0c2aff79ffcbcbb1427997ee..fec145cc9c022bf6d4366cf11a950a5db73dd202 100644
--- a/Core/Tools/OutputData.cpp
+++ b/Core/Tools/OutputData.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
 //! @file      Tools/OutputData.cpp
-//! @brief     Just include OutputData.h.
+//! @brief     Implements template specializations of class OutputData.cpp.
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -22,9 +22,9 @@
 #define NO_IMPORT_ARRAY
 #include "numpy/arrayobject.h"
 
+#include <iostream>
 
 
-#include <iostream>
 template<>
 PyObject *OutputData<double>::getArray() const
 {
@@ -49,8 +49,7 @@ PyObject *OutputData<double>::getArray() const
     PyObject *pyarray = PyArray_SimpleNew(ndim_numpy, ndimsizes_numpy, NPY_DOUBLE);
     delete [] ndimsizes_numpy;
     if(pyarray == nullptr ) {
-        throw RuntimeErrorException(
-                "ExportOutputData() -> Panic in PyArray_SimpleNew");
+        throw RuntimeErrorException("ExportOutputData() -> Panic in PyArray_SimpleNew");
     }
     Py_INCREF(pyarray);
 
diff --git a/Core/Tools/OutputData.h b/Core/Tools/OutputData.h
index eb041801eb94c8c1648ebed5c5bfa5704cc1eea7..e9ffd1595d428cdb02943ef5a41a788fac9b29a9 100644
--- a/Core/Tools/OutputData.h
+++ b/Core/Tools/OutputData.h
@@ -23,7 +23,6 @@ typedef _object PyObject;
 #endif
 #endif
 
-
 #include "Types.h"
 #include "FixedBinAxis.h"
 #include "LLData.h"
@@ -33,6 +32,7 @@ typedef _object PyObject;
 #include <sstream>
 #include <cassert>
 
+
 //! @class OutputData
 //! @ingroup tools
 //! @brief Template class to store data of any type in multi-dimensional space.
@@ -50,8 +50,7 @@ public:
     template <class U> void copyShapeFrom(const OutputData<U>& other);
 
     void addAxis(const IAxis& new_axis);
-    void addAxis(const std::string& name, size_t size,
-                 double start, double end);
+    void addAxis(const std::string& name, size_t size, double start, double end);
 
     //! returns axis with given serial number
     const IAxis *getAxis(size_t serial_number) const;
@@ -223,15 +222,13 @@ public:
     //! indexed accessor
     T& operator[](size_t index) {
         if (mp_ll_data) return (*mp_ll_data)[index];
-        throw ClassInitializationException("Low-level data object was not"
-                " yet initialized");
+        throw ClassInitializationException("Low-level data object was not yet initialized");
     }
 
     //! indexed accessor (const)
     const T& operator[](size_t index) const {
         if (mp_ll_data) return (*mp_ll_data)[index];
-        throw ClassInitializationException("Low-level data object was not"
-                " yet initialized");
+        throw ClassInitializationException("Low-level data object was not yet initialized");
     }
 
     // --------
diff --git a/Fit/FitKernel/FitKernel.cpp b/Fit/FitKernel/FitKernel.cpp
index 3ec714f1a175381040b2bbfd75025096690f5bab..7972862ae2a13f5ca8fd43a237ff07b4220ec72e 100644
--- a/Fit/FitKernel/FitKernel.cpp
+++ b/Fit/FitKernel/FitKernel.cpp
@@ -91,13 +91,13 @@ void FitKernel::runFit()
 
     m_is_last_iteration = false;
 
-    // linking fit parameters with parameters defined in the simulation
+    // link fit parameters with parameters defined in the simulation
     link_fit_parameters();
 
-    // running minimization using strategies
+    // run minimization using strategies
     m_fit_strategies.minimize();
 
-    // calling observers to let them to get results
+    // call observers to let them to get results
     m_is_last_iteration = true;
     notifyObservers();
 
@@ -106,7 +106,7 @@ void FitKernel::runFit()
 
 void FitKernel::minimize()
 {
-    // initializing minimizer with fitting functions
+    // initialize minimizer with fitting functions
     IMinimizer::function_chi2_t fun_chi2 =  [&] (const double* pars) {return m_function_chi2.evaluate(pars);};
     m_minimizer->setChiSquaredFunction( fun_chi2, m_fit_parameters.size());
 
@@ -117,18 +117,18 @@ void FitKernel::minimize()
         };
     m_minimizer->setGradientFunction( fun_gradient, m_fit_parameters.size(), m_fit_objects.getSizeOfDataSet() );
 
-    // initializing minimizer's parameters with the list of local fit parameters
+    // initialize minimizer's parameters with the list of local fit parameters
     m_minimizer->setParameters(m_fit_parameters);
 
     // setting number of free parameters for proper chi2 normalization
     m_fit_objects.setNfreeParameters((int)m_fit_parameters.getNfreeParameters());
 
-    // minimizing
+    // minimize
     try {
         m_minimizer->minimize();
     } catch (int) {}
 
-    // setting found values to the parameters
+    // set found values to the parameters
     m_fit_parameters.setValues(m_minimizer->getValueOfVariablesAtMinimum());
     m_fit_parameters.setErrors(m_minimizer->getErrorOfVariables());
     m_fit_objects.runSimulations(); // we run simulation once again for best values found
diff --git a/Fit/FitKernel/FitStrategyAdjustMinimizer.cpp b/Fit/FitKernel/FitStrategyAdjustMinimizer.cpp
index a716ae2c3e551e20b7328923ab9a896d7e1ff0a1..ef8175d2185489c0df080db20cfa2ca33eba09d7 100644
--- a/Fit/FitKernel/FitStrategyAdjustMinimizer.cpp
+++ b/Fit/FitKernel/FitStrategyAdjustMinimizer.cpp
@@ -19,15 +19,14 @@
 
 
 FitStrategyAdjustMinimizer::FitStrategyAdjustMinimizer()
-    : IFitStrategy("FitStrategyAdjustMinimizer"), m_minimizer(0)
+    : IFitStrategy("FitStrategyAdjustMinimizer"), m_minimizer(nullptr)
 {
-
 }
 
 FitStrategyAdjustMinimizer::FitStrategyAdjustMinimizer(const std::string &minimizer_name,
                                                        const std::string &algorithm_name,
                                                        const std::string &minimizer_options)
-    : IFitStrategy("FitStrategyAdjustMinimizer"), m_minimizer(0)
+    : IFitStrategy("FitStrategyAdjustMinimizer"), m_minimizer(nullptr)
 {
     setMinimizer(minimizer_name, algorithm_name, minimizer_options);
 }
@@ -72,16 +71,13 @@ void FitStrategyAdjustMinimizer::execute()
     m_fit_kernel->minimize();
 
     //m_fit_suite->printResults();
-
 }
 
 MinimizerOptions *FitStrategyAdjustMinimizer::getMinimizerOptions()
 {
-    if(!m_minimizer) {
-        return 0;
-    } else {
-        return m_minimizer->getOptions();
-    }
+    if(!m_minimizer)
+        return nullptr;
+    return m_minimizer->getOptions();
 }
 
 void FitStrategyAdjustMinimizer::print(std::ostream &ostr) const
diff --git a/Fit/FitKernel/FitStrategyAdjustMinimizer.h b/Fit/FitKernel/FitStrategyAdjustMinimizer.h
index 09a0d5594de3df59c9ffcb8205cb51744e3d5e7b..05d3c53087612cb9957450aef78140955583c554 100644
--- a/Fit/FitKernel/FitStrategyAdjustMinimizer.h
+++ b/Fit/FitKernel/FitStrategyAdjustMinimizer.h
@@ -57,4 +57,3 @@ private:
 };
 
 #endif // FITSTRATEGYADJUSTMINIMIZER_H
-
diff --git a/Fit/FitKernel/FitSuiteObjects.h b/Fit/FitKernel/FitSuiteObjects.h
index b9cdd89e3c435f125df20b8d7f415e67735122c6..a4a5149b40236e50915918f2275e7d46f3715102 100644
--- a/Fit/FitKernel/FitSuiteObjects.h
+++ b/Fit/FitKernel/FitSuiteObjects.h
@@ -96,7 +96,6 @@ class BA_CORE_API_  FitSuiteObjects : public IParameterized
 
     inline size_t check_index(size_t index) const;
 
-
     FitObjects_t m_fit_objects;
     double m_total_weight;
     int m_nfree_parameters;
diff --git a/Fit/FitKernel/FitSuiteStrategies.cpp b/Fit/FitKernel/FitSuiteStrategies.cpp
index deec03c7a2340c4b163210ac0bb460719cb10386..02b28e83cfe0553a89de9c766a4848fdebec84cc 100644
--- a/Fit/FitKernel/FitSuiteStrategies.cpp
+++ b/Fit/FitKernel/FitSuiteStrategies.cpp
@@ -18,7 +18,8 @@
 #include "MessageService.h"
 #include <cassert>
 
-FitSuiteStrategies::FitSuiteStrategies() : m_fit_kernel(0), m_current_strategy_index(0)
+FitSuiteStrategies::FitSuiteStrategies()
+    : m_fit_kernel(nullptr), m_current_strategy_index(0)
 {
 }
 
@@ -53,7 +54,7 @@ void FitSuiteStrategies::minimize()
     if( m_strategies.empty() ) {
          m_fit_kernel->minimize();
     } else {
-        for(strategies_t::iterator it=m_strategies.begin(); it!=m_strategies.end(); ++it) {
+        for(auto it=m_strategies.begin(); it!=m_strategies.end(); ++it) {
             //msglog(MSG::INFO) << "FitSuiteStrategies::minimize() -> Running strategy #" << m_current_strategy_index << " '" << (*it)->getName() << "'";
             (*it)->execute();
             ++m_current_strategy_index;
@@ -61,5 +62,3 @@ void FitSuiteStrategies::minimize()
         --m_current_strategy_index;
     }
 }
-
-
diff --git a/Fit/FitKernel/FitSuiteStrategies.h b/Fit/FitKernel/FitSuiteStrategies.h
index 5d80a87e38b76f654ada1bc3f516724c30c2a025..98be64f89808ab77c1afe5dfeafc80c891f4f353 100644
--- a/Fit/FitKernel/FitSuiteStrategies.h
+++ b/Fit/FitKernel/FitSuiteStrategies.h
@@ -25,12 +25,9 @@ class FitKernel;
 //! @ingroup fitting_internal
 //! @brief Collection of strategies to fit
 
-class BA_CORE_API_  FitSuiteStrategies
+class BA_CORE_API_ FitSuiteStrategies
 {
 public:
-    typedef SafePointerVector<IFitStrategy > strategies_t;
-    typedef strategies_t::iterator iterator;
-
     FitSuiteStrategies();
     virtual ~FitSuiteStrategies();
 
@@ -47,12 +44,11 @@ public:
     void clear();
 
     IFitStrategy *getCurrentStrategy();
+    
 private:
-    strategies_t m_strategies;
+    SafePointerVector<IFitStrategy> m_strategies;
     FitKernel *m_fit_kernel;
     size_t m_current_strategy_index;
 };
 
 #endif // FITSUITESTRATEGIES_H
-
-
diff --git a/Fit/FitKernel/IFitStrategy.cpp b/Fit/FitKernel/IFitStrategy.cpp
index 7b092b13a52a82fe5480994ce5e1118075fa7443..aeb64d94ffb2bfdd0a1c79df51fbc078f89d9a96 100644
--- a/Fit/FitKernel/IFitStrategy.cpp
+++ b/Fit/FitKernel/IFitStrategy.cpp
@@ -17,20 +17,13 @@
 #include "FitKernel.h"
 
 IFitStrategy::IFitStrategy()
-    : m_fit_kernel(0)
+    : m_fit_kernel(nullptr)
 {
-
 }
 
 IFitStrategy::IFitStrategy(const std::string &name)
-    : INamed(name), m_fit_kernel(0)
+    : INamed(name), m_fit_kernel(nullptr)
 {
-
-}
-
-IFitStrategy::~IFitStrategy()
-{
-
 }
 
 void IFitStrategy::init(FitKernel *fit_suite)
@@ -38,12 +31,6 @@ void IFitStrategy::init(FitKernel *fit_suite)
     m_fit_kernel = fit_suite;
 }
 
-//std::ostream &IFitStrategy::operator<<(std::ostream &ostr, const IFitStrategy &m)
-//{
-//    m.print(ostr);
-//    return ostr;
-//}
-
 void IFitStrategy::print(std::ostream &ostr) const
 {
     ostr << getName();
@@ -60,7 +47,6 @@ IFitStrategy::IFitStrategy(const IFitStrategy &other)
 FitStrategyDefault::FitStrategyDefault()
     : IFitStrategy("DefaultFitStrategy")
 {
-
 }
 
 IFitStrategy *FitStrategyDefault::clone() const
@@ -76,4 +62,3 @@ void FitStrategyDefault::execute()
     // calling minimization
     m_fit_kernel->minimize();
 }
-
diff --git a/Fit/FitKernel/IFitStrategy.h b/Fit/FitKernel/IFitStrategy.h
index ce258dc6a10812d3778d0f31ed81d5f7146d6f9a..e0770c4ebd2929c1fb3fa107c9b65e8bf644b6b0 100644
--- a/Fit/FitKernel/IFitStrategy.h
+++ b/Fit/FitKernel/IFitStrategy.h
@@ -25,8 +25,7 @@ class FitKernel;
 //! @ingroup fitting_internal
 //! @brief Interface to concrete fit strategy.
 //!
-//!  Concrete implementation should manipulate with fit parameters/data
-//!  and then call minimizer.
+//!  Concrete implementation should manipulate with fit parameters/data and then call minimizer.
 
 class BA_CORE_API_ IFitStrategy : public INamed
 {
@@ -35,7 +34,7 @@ public:
     IFitStrategy(const std::string& name);
     virtual IFitStrategy *clone() const = 0;
 
-    virtual ~IFitStrategy();
+    virtual ~IFitStrategy() {};
     virtual void init(FitKernel *fit_suite);
     virtual void execute() = 0;
 
diff --git a/Fit/FitKernel/MinimizerFactory.cpp b/Fit/FitKernel/MinimizerFactory.cpp
index 646706040d5ee22fb6e28c27cde70d2141ebd6a5..487450e4ccaff333523d5c1f50c7ccd4f73f62f7 100644
--- a/Fit/FitKernel/MinimizerFactory.cpp
+++ b/Fit/FitKernel/MinimizerFactory.cpp
@@ -105,10 +105,9 @@ IMinimizer *MinimizerFactory::createMinimizer(const std::string& minimizer, cons
     } else if( minimizer == "Genetic" ) {
         result = new ROOTGeneticMinimizer(minimizer, algorithm);
 
-    }
-
-    if(!result) {
+    } else  {
         throw LogicErrorException("MinimizerFactory::createMinimizer() -> Error! Wrong minimizer name '"+minimizer+"'");
+        
     }
 
     if( !options.empty() ) {
@@ -123,7 +122,6 @@ IMinimizer *MinimizerFactory::createMinimizer(const std::string& minimizer, cons
 }
 
 
-
 //! Create minimizer using existing one. Only minimizer type and minimizer settings are propagated.
 //! This method serves as a kind of 'shallow' clone for minimizer.
 //! The reason why the minimizer doesn't have own clone method is because of complicate structure of
@@ -134,4 +132,3 @@ IMinimizer *MinimizerFactory::createMinimizer(const IMinimizer *minimizer)
     result->setOptions(*minimizer->getOptions());
     return result;
 }
-
diff --git a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
index a28029b2752caba3f5adf8e0ccc02a5047cc3060..830620a1d479d6651c49ea04d45744c0f1e6e017 100644
--- a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
@@ -83,7 +83,6 @@ bool JobListViewDelegate::editorEvent(QEvent *event,
     } else {
         m_buttonState = QStyle::State_Raised;
         return QItemDelegate::editorEvent(event, model, option, index);
-        return true;
     }
 
     const JobModel* jqmodel = static_cast<const JobModel*>(index.model());