diff --git a/ApplicationLibCode/Commands/3dView/RicApplyUserDefinedCameraFeature.cpp b/ApplicationLibCode/Commands/3dView/RicApplyUserDefinedCameraFeature.cpp
index 613e8d63b6..6e30194eaf 100644
--- a/ApplicationLibCode/Commands/3dView/RicApplyUserDefinedCameraFeature.cpp
+++ b/ApplicationLibCode/Commands/3dView/RicApplyUserDefinedCameraFeature.cpp
@@ -44,9 +44,7 @@ bool RicApplyUserDefinedCameraFeature::isCommandEnabled() const
     cvf::Vec3d up  = cvf::Vec3d::UNDEFINED;
 
     readCameraFromSettings( eye, vrp, up );
-    if ( eye.isUndefined() || vrp.isUndefined() || up.isUndefined() ) return false;
-
-    return true;
+    return !( eye.isUndefined() || vrp.isUndefined() || up.isUndefined() );
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicExitApplicationFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicExitApplicationFeature.cpp
index 340568fecc..4fb91901f2 100644
--- a/ApplicationLibCode/Commands/ApplicationCommands/RicExitApplicationFeature.cpp
+++ b/ApplicationLibCode/Commands/ApplicationCommands/RicExitApplicationFeature.cpp
@@ -67,7 +67,7 @@ void RicExitApplicationFeature::onActionTriggered( bool isChecked )
     // shutdown. The slot onLastWindowClosed() configured in RiaGuiApplication::RiaGuiApplication is never called. Testing with
     // processEvents() had no effect.
     app->closeProject();
-    app->quit();
+    RiaGuiApplication::quit();
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/Commands/PolygonCommands/RicBasicPolygonFeature.cpp b/ApplicationLibCode/Commands/PolygonCommands/RicBasicPolygonFeature.cpp
index 7041ab04eb..a1d49cf15c 100644
--- a/ApplicationLibCode/Commands/PolygonCommands/RicBasicPolygonFeature.cpp
+++ b/ApplicationLibCode/Commands/PolygonCommands/RicBasicPolygonFeature.cpp
@@ -41,7 +41,7 @@ bool RicBasicPolygonFeature::isCommandEnabled() const
 {
     auto polygons = selectedPolygons();
 
-    return m_multiSelectSupported ? polygons.size() > 0 : polygons.size() == 1;
+    return m_multiSelectSupported ? !polygons.empty() : polygons.size() == 1;
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/FileInterface/RifCaseRealizationParametersReader.cpp b/ApplicationLibCode/FileInterface/RifCaseRealizationParametersReader.cpp
index c5156b8fcd..6a3d10937b 100644
--- a/ApplicationLibCode/FileInterface/RifCaseRealizationParametersReader.cpp
+++ b/ApplicationLibCode/FileInterface/RifCaseRealizationParametersReader.cpp
@@ -63,11 +63,11 @@ std::shared_ptr<RifCaseRealizationReader> RifCaseRealizationReader::createReader
 
     if ( fileName.endsWith( parametersFileName() ) )
     {
-        reader.reset( new RifCaseRealizationParametersReader( fileName ) );
+        reader = std::make_shared<RifCaseRealizationParametersReader>( fileName );
     }
     else if ( fileName.endsWith( runSpecificationFileName() ) )
     {
-        reader.reset( new RifCaseRealizationRunspecificationReader( fileName ) );
+        reader = std::make_shared<RifCaseRealizationRunspecificationReader>( fileName );
     }
     return reader;
 }
diff --git a/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp b/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp
index d38fc61828..4531d02ce9 100644
--- a/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp
+++ b/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp
@@ -490,7 +490,7 @@ std::string RifEclipseSummaryAddress::generateStringFromAddresses( const std::ve
     std::string addrString;
     for ( const RifEclipseSummaryAddress& address : addressVector )
     {
-        if ( addrString.length() > 0 )
+        if ( !addrString.empty() )
         {
             addrString += jointString;
         }
diff --git a/ApplicationLibCode/FileInterface/RifReaderOpmCommon.cpp b/ApplicationLibCode/FileInterface/RifReaderOpmCommon.cpp
index d5f13c46cd..ea77f6fe6d 100644
--- a/ApplicationLibCode/FileInterface/RifReaderOpmCommon.cpp
+++ b/ApplicationLibCode/FileInterface/RifReaderOpmCommon.cpp
@@ -772,7 +772,7 @@ std::vector<RigEclipseTimeStepInfo> RifReaderOpmCommon::createFilteredTimeStepIn
 
     auto timeStepsOnFile = readTimeSteps();
 
-    if ( timeStepsOnFile.size() == 0 ) return timeStepInfos;
+    if ( timeStepsOnFile.empty() ) return timeStepInfos;
 
     auto  startDayOffset = timeStepsOnFile[0].simulationTimeFromStart;
     QDate startDate( timeStepsOnFile[0].year, timeStepsOnFile[0].month, timeStepsOnFile[0].day );
@@ -1026,7 +1026,7 @@ std::vector<QDateTime> RifReaderOpmCommon::timeStepsOnFile( QString gridFileName
     if ( m_restartFile == nullptr ) return {};
 
     auto timeStepsOnFile = readTimeSteps();
-    if ( timeStepsOnFile.size() == 0 ) return {};
+    if ( timeStepsOnFile.empty() ) return {};
 
     auto  startDayOffset = timeStepsOnFile[0].simulationTimeFromStart;
     QDate startDate( timeStepsOnFile[0].year, timeStepsOnFile[0].month, timeStepsOnFile[0].day );
diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp
index 005b771caf..d2edc24cda 100644
--- a/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimReachCircleAnnotation.cpp
@@ -18,6 +18,8 @@
 
 #include "RimReachCircleAnnotation.h"
 
+#include <memory>
+
 #include "RimAnnotationCollection.h"
 #include "RimAnnotationInViewCollection.h"
 #include "RimAnnotationLineAppearance.h"
@@ -54,7 +56,7 @@ RimReachCircleAnnotation::RimReachCircleAnnotation()
     m_appearance = new RimReachCircleLineAppearance();
     m_appearance.uiCapability()->setUiTreeChildrenHidden( true );
 
-    m_centerPointEventHandler.reset( new RicVec3dPickEventHandler( &m_centerPointXyd ) );
+    m_centerPointEventHandler = std::make_shared<RicVec3dPickEventHandler>( &m_centerPointXyd );
 
     setDeletable( true );
 }
diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp
index 5c18975bce..cdfc35020a 100644
--- a/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimTextAnnotation.cpp
@@ -37,6 +37,7 @@
 
 #include <QAction>
 #include <QPointer>
+#include <memory>
 
 CAF_PDM_SOURCE_INIT( RimTextAnnotation, "RimTextAnnotation" );
 
@@ -73,8 +74,8 @@ RimTextAnnotation::RimTextAnnotation()
     m_nameProxy.uiCapability()->setUiReadOnly( true );
     m_nameProxy.xmlCapability()->disableIO();
 
-    m_anchorPointPickEventHandler.reset( new RicVec3dPickEventHandler( &m_anchorPointXyd ) );
-    m_labelPointPickEventHandler.reset( new RicVec3dPickEventHandler( &m_labelPointXyd, 0.1 ) );
+    m_anchorPointPickEventHandler = std::make_shared<RicVec3dPickEventHandler>( &m_anchorPointXyd );
+    m_labelPointPickEventHandler  = std::make_shared<RicVec3dPickEventHandler>( &m_labelPointXyd, 0.1 );
 
     setDeletable( true );
 }
diff --git a/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp b/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp
index 459fd561e7..96baaa0f3b 100644
--- a/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp
+++ b/ApplicationLibCode/ProjectDataModel/ContourMap/RimStatisticsContourMap.cpp
@@ -150,7 +150,7 @@ RimStatisticsContourMap::RimStatisticsContourMap()
 //--------------------------------------------------------------------------------------------------
 void RimStatisticsContourMap::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
 {
-    if ( ( eclipseCase() == nullptr ) && ( ensemble()->cases().size() > 0 ) )
+    if ( ( eclipseCase() == nullptr ) && ( !ensemble()->cases().empty() ) )
     {
         auto selCase = ensemble()->cases().front();
         setEclipseCase( selCase );
@@ -551,7 +551,7 @@ void RimStatisticsContourMap::computeStatistics()
             auto          formationNames = selectedFormations();
 
             bool formationNamesOk = true;
-            if ( formationNames.size() > 0 )
+            if ( !formationNames.empty() )
             {
                 if ( auto names = eCase->activeFormationNames() )
                 {
diff --git a/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp b/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp
index 7148d9fbd1..3336d6cbdf 100644
--- a/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Rim3dView.cpp
@@ -1661,7 +1661,7 @@ void Rim3dView::appendAnnotationsToModel()
     if ( frameScene )
     {
         cvf::String name = "Annotations";
-        this->removeModelByName( frameScene, name );
+        Rim3dView::removeModelByName( frameScene, name );
 
         cvf::ref<cvf::ModelBasicList> model = new cvf::ModelBasicList;
         model->setName( name );
diff --git a/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp
index 868447158d..82ca090cd4 100644
--- a/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp
@@ -43,6 +43,7 @@
 #include "cvfAssert.h"
 
 #include <cmath>
+#include <memory>
 
 CAF_PDM_SOURCE_INIT( RimGridStatisticsPlot, "GridStatisticsPlot" );
 
@@ -243,7 +244,7 @@ bool RimGridStatisticsPlot::hasStatisticsData() const
 RigHistogramData RimGridStatisticsPlot::createStatisticsData() const
 {
     std::unique_ptr<RimHistogramCalculator> histogramCalculator;
-    histogramCalculator.reset( new RimHistogramCalculator );
+    histogramCalculator = std::make_unique<RimHistogramCalculator>();
     histogramCalculator->setNumBins( static_cast<size_t>( m_numHistogramBins() ) );
 
     RigHistogramData histogramData;
diff --git a/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp b/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
index a7729866c5..fbe6c52edc 100644
--- a/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
@@ -641,7 +641,7 @@ void RimGridTimeHistoryCurve::fieldChangedByUi( const caf::PdmFieldHandle* chang
     }
     else
     {
-        RimPlotCurve::fieldChangedByUi( changedField, oldValue, newValue );
+        RimStackablePlotCurve::fieldChangedByUi( changedField, oldValue, newValue );
     }
 }
 
diff --git a/ApplicationLibCode/ReservoirDataModel/ContourMap/RigContourMapCalculator.cpp b/ApplicationLibCode/ReservoirDataModel/ContourMap/RigContourMapCalculator.cpp
index 65918234a7..c9f9a934c3 100644
--- a/ApplicationLibCode/ReservoirDataModel/ContourMap/RigContourMapCalculator.cpp
+++ b/ApplicationLibCode/ReservoirDataModel/ContourMap/RigContourMapCalculator.cpp
@@ -260,7 +260,7 @@ std::vector<std::vector<std::pair<size_t, double>>>
     std::vector<std::vector<std::pair<size_t, double>>> projected3dGridIndices( nCells );
 
     const bool isSummationResult = RigContourMapCalculator::isStraightSummationResult( resultAggregation );
-    const bool usePolygonLimits  = limitToPolygons.size() > 0;
+    const bool usePolygonLimits  = !limitToPolygons.empty();
 
 #pragma omp parallel for
     for ( int index = 0; index < nCells; ++index )
diff --git a/ApplicationLibCode/UserInterface/RiuQtChartsPlotCurve.cpp b/ApplicationLibCode/UserInterface/RiuQtChartsPlotCurve.cpp
index 0052aee434..cdcd99e735 100644
--- a/ApplicationLibCode/UserInterface/RiuQtChartsPlotCurve.cpp
+++ b/ApplicationLibCode/UserInterface/RiuQtChartsPlotCurve.cpp
@@ -380,9 +380,7 @@ void RiuQtChartsPlotCurve::updateScatterSeries()
 //--------------------------------------------------------------------------------------------------
 bool RiuQtChartsPlotCurve::isQtChartObjectsPresent() const
 {
-    if ( !lineSeries() ) return false;
-
-    return true;
+    return lineSeries() != nullptr;
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp b/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp
index a12c3cd89b..1095763c52 100644
--- a/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp
+++ b/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp
@@ -1188,9 +1188,7 @@ void RiuQtChartsPlotWidget::wheelEvent( QWheelEvent* wheelEvent )
 //--------------------------------------------------------------------------------------------------
 bool RiuQtChartsPlotWidget::eventFilter( QObject* watched, QEvent* event )
 {
-    if ( RiuPlotWidget::handleDragDropEvent( event ) ) return true;
-
-    return false;
+    return RiuPlotWidget::handleDragDropEvent( event );
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp b/ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp
index 4271a4c1be..1f1e891188 100644
--- a/ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp
+++ b/ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp
@@ -1014,7 +1014,7 @@ void RiuQwtPlotWidget::selectClosestPlotItem( const QPoint& pos, bool toggleItem
         {
             for ( auto highlightedCurve : m_hightlightedCurves )
             {
-                if ( toggleItemInSelection && ( highlightedCurve == clickedCurve ) )
+                if ( ( highlightedCurve == clickedCurve ) )
                 {
                     wasToggledOff = true;
                     continue;