diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp
index c94e0435d..61e80be63 100644
--- a/src/blackgui/components/mappingcomponent.cpp
+++ b/src/blackgui/components/mappingcomponent.cpp
@@ -383,8 +383,9 @@ namespace BlackGui
         CIdentifier CMappingComponent::mappingIdentifier()
         {
             if (m_identifier.getName().isEmpty())
+            {
                 m_identifier = CIdentifier(QStringLiteral("MAPPINGCOMPONENT"));
-
+            }
             return m_identifier;
         }
 
diff --git a/src/blackgui/components/mappingcomponent.h b/src/blackgui/components/mappingcomponent.h
index 8f3417eba..0d310c9ba 100644
--- a/src/blackgui/components/mappingcomponent.h
+++ b/src/blackgui/components/mappingcomponent.h
@@ -123,16 +123,21 @@ namespace BlackGui
             void ps_onMenuHighlightInSimulator(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
 
         private:
+            //! Identifier for data send from this component
             BlackMisc::CIdentifier mappingIdentifier();
+
+            //! Update simulated aircraft view
             void updateSimulatedAircraftView(bool forceUpdate = false);
+
             QScopedPointer<Ui::CMappingComponent> ui;
-            QScopedPointer<CUpdateTimer> m_updateTimer;
-            QCompleter *m_modelCompleter = nullptr;
-            bool m_missedSimulatedAircraftUpdate = true;
-            BlackGui::Views::CCheckBoxDelegate *m_currentMappingsViewDelegate = nullptr;
-            BlackMisc::CIdentifier m_identifier;
+            QScopedPointer<CUpdateTimer>          m_updateTimer;
+            QCompleter                           *m_modelCompleter = nullptr;
+            bool                                  m_missedSimulatedAircraftUpdate = true;
+            BlackGui::Views::CCheckBoxDelegate   *m_currentMappingsViewDelegate = nullptr;
+            BlackMisc::CIdentifier                m_identifier;
 
         private slots:
+            //! Updated by timer
             void ps_backgroundUpdate();
         };
 
diff --git a/src/blackgui/models/listmodelbase.cpp b/src/blackgui/models/listmodelbase.cpp
index 8869c97c4..781370302 100644
--- a/src/blackgui/models/listmodelbase.cpp
+++ b/src/blackgui/models/listmodelbase.cpp
@@ -371,7 +371,7 @@ namespace BlackGui
         {
             if (!filter)
             {
-                this->removeFilter();    // empty filter
+                this->removeFilter();    // clear filter
                 return;
             }
             if (filter->isValid())
@@ -384,6 +384,7 @@ namespace BlackGui
             }
             else
             {
+                // invalid filter, so clear filter
                 this->removeFilter();
             }
         }