diff --git a/ApplicationCode/Commands/ApplicationCommands/RicHelpFeatures.cpp b/ApplicationCode/Commands/ApplicationCommands/RicHelpFeatures.cpp
index e92eb5326c..9d3d560719 100644
--- a/ApplicationCode/Commands/ApplicationCommands/RicHelpFeatures.cpp
+++ b/ApplicationCode/Commands/ApplicationCommands/RicHelpFeatures.cpp
@@ -1,17 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2016-     Statoil ASA
-// 
+//
 //  ResInsight is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
 //  the Free Software Foundation, either version 3 of the License, or
 //  (at your option) any later version.
-// 
+//
 //  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
 //  WARRANTY; without even the implied warranty of MERCHANTABILITY or
 //  FITNESS FOR A PARTICULAR PURPOSE.
-// 
-//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
 //  for more details.
 //
 /////////////////////////////////////////////////////////////////////////////////
@@ -32,12 +32,12 @@
 #include <QErrorMessage>
 #include <QUrl>
 
-CAF_CMD_SOURCE_INIT(RicHelpAboutFeature,            "RicHelpAboutFeature");
-CAF_CMD_SOURCE_INIT(RicHelpCommandLineFeature,      "RicHelpCommandLineFeature");
-CAF_CMD_SOURCE_INIT(RicHelpOpenUsersGuideFeature,   "RicHelpOpenUsersGuideFeature");
+CAF_CMD_SOURCE_INIT(RicHelpAboutFeature, "RicHelpAboutFeature");
+CAF_CMD_SOURCE_INIT(RicHelpCommandLineFeature, "RicHelpCommandLineFeature");
+CAF_CMD_SOURCE_INIT(RicHelpOpenUsersGuideFeature, "RicHelpOpenUsersGuideFeature");
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
 bool RicHelpAboutFeature::isCommandEnabled()
 {
@@ -45,7 +45,7 @@ bool RicHelpAboutFeature::isCommandEnabled()
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
 void RicHelpAboutFeature::onActionTriggered(bool isChecked)
 {
@@ -77,7 +77,7 @@ void RicHelpAboutFeature::onActionTriggered(bool isChecked)
     {
         dlg.addVersionEntry(" ", "Features");
 
-        for (auto feature : activeFeatures)
+        for (const auto& feature : activeFeatures)
         {
             dlg.addVersionEntry(" ", feature);
         }
@@ -112,7 +112,7 @@ void RicHelpAboutFeature::onActionTriggered(bool isChecked)
                 render = str;
             }
         }
-        
+
         dlg.addVersionEntry(" ", QString("   ") + vendor + " : " + render);
     }
 
@@ -123,21 +123,15 @@ void RicHelpAboutFeature::onActionTriggered(bool isChecked)
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
 void RicHelpAboutFeature::setupActionLook(QAction* actionToSetup)
 {
     actionToSetup->setText("&About");
 }
 
-
-
-
-
-
-
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
 bool RicHelpCommandLineFeature::isCommandEnabled()
 {
@@ -145,32 +139,27 @@ bool RicHelpCommandLineFeature::isCommandEnabled()
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
 void RicHelpCommandLineFeature::onActionTriggered(bool isChecked)
 {
     this->disableModelChangeContribution();
 
-    RiaApplication* app = RiaApplication::instance();
-    QString text = app->commandLineParameterHelp();
+    RiaApplication* app  = RiaApplication::instance();
+    QString         text = app->commandLineParameterHelp();
     app->showFormattedTextInMessageBox(text);
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
 void RicHelpCommandLineFeature::setupActionLook(QAction* actionToSetup)
 {
     actionToSetup->setText("&Command Line Help");
 }
 
-
-
-
-
-
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
 bool RicHelpOpenUsersGuideFeature::isCommandEnabled()
 {
@@ -178,7 +167,7 @@ bool RicHelpOpenUsersGuideFeature::isCommandEnabled()
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
 void RicHelpOpenUsersGuideFeature::onActionTriggered(bool isChecked)
 {
@@ -194,12 +183,10 @@ void RicHelpOpenUsersGuideFeature::onActionTriggered(bool isChecked)
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
 void RicHelpOpenUsersGuideFeature::setupActionLook(QAction* actionToSetup)
 {
     actionToSetup->setText("&Users Guide");
     actionToSetup->setShortcut(QKeySequence::HelpContents);
 }
-
-