diff --git a/src/blackcore/context/contextnetwork.h b/src/blackcore/context/contextnetwork.h
index 4ed425270..4d4aa7b0b 100644
--- a/src/blackcore/context/contextnetwork.h
+++ b/src/blackcore/context/contextnetwork.h
@@ -148,7 +148,7 @@ namespace BlackCore
             void kicked(const QString &kickMessage);
 
             //! Connection status changed
-            void connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
+            void connectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to);
 
             //! Text messages received (also private chat messages, radio channel messages)
             void textMessagesReceived(const BlackMisc::Network::CTextMessageList &textMessages);
@@ -225,7 +225,7 @@ namespace BlackCore
 
             //! Connect to Network
             //! \return messages generated during connecting
-            virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, BlackCore::INetwork::LoginMode loginMode) = 0;
+            virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, INetwork::LoginMode loginMode) = 0;
 
             //! Server which is connected, if not connected empty default object.
             virtual BlackMisc::Network::CServer getConnectedServer() const = 0;
diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp
index 37f7d909d..d8930122f 100644
--- a/src/blackcore/context/contextsimulatorimpl.cpp
+++ b/src/blackcore/context/contextsimulatorimpl.cpp
@@ -55,13 +55,14 @@ namespace BlackCore
             CIdentifiable(this),
             m_plugins(new CPluginManagerSimulator(this))
         {
-            setObjectName("CContextSimulator");
-            m_enableMatchingMessages = sApp->isRunningInDeveloperEnvironment();
-            connect(&m_weatherManager, &CWeatherManager::weatherGridReceived, this, &CContextSimulator::weatherGridReceived);
-            m_plugins->collectPlugins();
-            restoreSimulatorPlugins();
-
+            this->setObjectName("CContextSimulator");
             CContextSimulator::registerHelp();
+
+            m_enableMatchingMessages = sApp->isRunningInDeveloperEnvironment();
+            m_plugins->collectPlugins();
+            this->restoreSimulatorPlugins();
+
+            connect(&m_weatherManager, &CWeatherManager::weatherGridReceived, this, &CContextSimulator::weatherGridReceived);
             connect(&m_modelSetLoader, &CAircraftModelSetLoader::simulatorChanged, this, &CContextSimulator::ps_modelSetChanged);
             connect(&m_modelSetLoader, &CAircraftModelSetLoader::cacheChanged, this, &CContextSimulator::ps_modelSetChanged);
 
diff --git a/src/blackcore/context/contextsimulatorimpl.h b/src/blackcore/context/contextsimulatorimpl.h
index f70d8f02e..63600de7e 100644
--- a/src/blackcore/context/contextsimulatorimpl.h
+++ b/src/blackcore/context/contextsimulatorimpl.h
@@ -12,12 +12,13 @@
 #ifndef BLACKCORE_CONTEXT_CONTEXTSIMULATOR_IMPL_H
 #define BLACKCORE_CONTEXT_CONTEXTSIMULATOR_IMPL_H
 
+#include "blackcore/corefacadeconfig.h"
+#include "blackcore/context/contextsimulator.h"
+#include "blackcore/application/applicationsettings.h"
 #include "blackcore/aircraftmatcher.h"
 #include "blackcore/blackcoreexport.h"
-#include "blackcore/context/contextsimulator.h"
-#include "blackcore/corefacadeconfig.h"
-#include "blackcore/application/applicationsettings.h"
 #include "blackcore/weathermanager.h"
+#include "blackcore/network.h"
 #include "blackmisc/aviation/airportlist.h"
 #include "blackmisc/identifier.h"
 #include "blackmisc/network/textmessagelist.h"
diff --git a/src/blackmisc/network/server.cpp b/src/blackmisc/network/server.cpp
index adbaf2a06..bcd48e28b 100644
--- a/src/blackmisc/network/server.cpp
+++ b/src/blackmisc/network/server.cpp
@@ -103,7 +103,7 @@ namespace BlackMisc
         QString CServer::getServerSessionId() const
         {
             if (!this->isConnected()) { return ""; }
-            const QString session("%1 %2:%3 %4 %5");
+            static const QString session("%1 %2:%3 %4 %5");
             return session.arg(this->getName(), this->getAddress()).arg(this->getPort()).arg(this->getUser().getRealName(), this->getFormattedUtcTimestampHms());
         }
 
diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp
index c814972e5..5a48f1770 100644
--- a/src/blackmisc/simulation/aircraftmodel.cpp
+++ b/src/blackmisc/simulation/aircraftmodel.cpp
@@ -7,13 +7,14 @@
  * contained in the LICENSE file.
  */
 
+#include "matchingutils.h"
+#include "aircraftmodel.h"
 #include "blackmisc/compare.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/db/datastoreutility.h"
 #include "blackmisc/fileutils.h"
 #include "blackmisc/logcategory.h"
 #include "blackmisc/logcategorylist.h"
-#include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/verify.h"
 
diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h
index 07e917251..df5754ff7 100644
--- a/src/blackmisc/simulation/aircraftmodel.h
+++ b/src/blackmisc/simulation/aircraftmodel.h
@@ -45,8 +45,6 @@
 namespace BlackMisc
 {
     class CIcon;
-    class CStatusMessage;
-
     namespace Simulation
     {
         //! Aircraft model (used by another pilot, my models on disk)
@@ -87,7 +85,7 @@ namespace BlackMisc
             //! Indexes
             enum ColumnIndex
             {
-                IndexModelString = BlackMisc::CPropertyIndex::GlobalIndexCAircraftModel,
+                IndexModelString = CPropertyIndex::GlobalIndexCAircraftModel,
                 IndexCallsign,
                 IndexName,
                 IndexDescription,
@@ -119,19 +117,19 @@ namespace BlackMisc
             CAircraftModel(const QString &model, ModelType type);
 
             //! Constructor.
-            CAircraftModel(const QString &model, ModelType type, const BlackMisc::Aviation::CAircraftIcaoCode &icao, const BlackMisc::Aviation::CLivery &livery);
+            CAircraftModel(const QString &model, ModelType type, const Aviation::CAircraftIcaoCode &icao, const Aviation::CLivery &livery);
 
             //! Constructor.
-            CAircraftModel(const QString &model, ModelType type, const QString &description, const BlackMisc::Aviation::CAircraftIcaoCode &icao, const BlackMisc::Aviation::CLivery &livery = BlackMisc::Aviation::CLivery());
+            CAircraftModel(const QString &model, ModelType type, const QString &description, const Aviation::CAircraftIcaoCode &icao, const Aviation::CLivery &livery = Aviation::CLivery());
 
             //! Constructor.
-            CAircraftModel(const QString &model, ModelType type, const CSimulatorInfo &simulator, const QString &name, const QString &description, const BlackMisc::Aviation::CAircraftIcaoCode &icao, const BlackMisc::Aviation::CLivery &livery = BlackMisc::Aviation::CLivery());
+            CAircraftModel(const QString &model, ModelType type, const CSimulatorInfo &simulator, const QString &name, const QString &description, const Aviation::CAircraftIcaoCode &icao, const Aviation::CLivery &livery = Aviation::CLivery());
 
             //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
-            CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
+            CVariant propertyByIndex(const CPropertyIndex &index) const;
 
             //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
-            void setPropertyByIndex(const BlackMisc::CPropertyIndex &index, const CVariant &variant);
+            void setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant);
 
             //! Compare by index
             int comparePropertyByIndex(const CPropertyIndex &index, const CAircraftModel &compareValue) const;
@@ -143,10 +141,10 @@ namespace BlackMisc
             bool canInitializeFromFsd() const;
 
             //! Corresponding callsign if applicable
-            const BlackMisc::Aviation::CCallsign &getCallsign() const { return m_callsign; }
+            const Aviation::CCallsign &getCallsign() const { return m_callsign; }
 
             //! Corresponding callsign if applicable
-            void setCallsign(const BlackMisc::Aviation::CCallsign &callsign);
+            void setCallsign(const Aviation::CCallsign &callsign);
 
             //! Callsign empty
             bool isCallsignEmpty() const { return m_callsign.isEmpty(); }
@@ -170,7 +168,7 @@ namespace BlackMisc
             void setQueriedModelString(const QString &model) { m_modelString = model; m_modelType = TypeQueriedFromNetwork; }
 
             //! Aircraft ICAO code
-            const BlackMisc::Aviation::CAircraftIcaoCode &getAircraftIcaoCode() const { return m_aircraftIcao; }
+            const Aviation::CAircraftIcaoCode &getAircraftIcaoCode() const { return m_aircraftIcao; }
 
             //! Aircraft ICAO code designator
             const QString &getAircraftIcaoCodeDesignator() const { return m_aircraftIcao.getDesignator(); }
@@ -179,7 +177,7 @@ namespace BlackMisc
             bool isVtol() const;
 
             //! Airline ICAO code
-            const BlackMisc::Aviation::CAirlineIcaoCode &getAirlineIcaoCode() const { return m_livery.getAirlineIcaoCode(); }
+            const Aviation::CAirlineIcaoCode &getAirlineIcaoCode() const { return m_livery.getAirlineIcaoCode(); }
 
             //! Airline ICAO code designator
             const QString &getAirlineIcaoCodeDesignator() const { return m_livery.getAirlineIcaoCode().getDesignator(); }
@@ -188,13 +186,13 @@ namespace BlackMisc
             const QString getAirlineIcaoCodeVDesignator() const { return m_livery.getAirlineIcaoCode().getVDesignator(); }
 
             //! Set aircraft ICAO code
-            bool setAircraftIcaoCode(const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcaoCode);
+            bool setAircraftIcaoCode(const Aviation::CAircraftIcaoCode &aircraftIcaoCode);
 
             //! Set aircraft ICAO code designator
             void setAircraftIcaoDesignator(const QString &designator);
 
             //! Set ICAO codes
-            void setAircraftIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcaoCode, const BlackMisc::Aviation::CAirlineIcaoCode &airlineIcaoCode);
+            void setAircraftIcaoCodes(const Aviation::CAircraftIcaoCode &aircraftIcaoCode, const Aviation::CAirlineIcaoCode &airlineIcaoCode);
 
             //! Valid airline and aircraft designator?
             bool hasValidAircraftAndAirlineDesignator() const;
@@ -218,10 +216,10 @@ namespace BlackMisc
             bool isCivilian() const;
 
             //! Get livery
-            const BlackMisc::Aviation::CLivery &getLivery() const { return m_livery; }
+            const Aviation::CLivery &getLivery() const { return m_livery; }
 
             //! Livery
-            void setLivery(const BlackMisc::Aviation::CLivery &livery) { m_livery = livery; }
+            void setLivery(const Aviation::CLivery &livery) { m_livery = livery; }
 
             //! Livery available?
             bool hasLivery() const { return m_livery.hasCompleteData();}
@@ -272,13 +270,13 @@ namespace BlackMisc
             ModelMode getModelMode() const { return m_modelMode; }
 
             //! Matches given mode?
-            bool matchesMode(BlackMisc::Simulation::CAircraftModel::ModelModeFilter mode) const;
+            bool matchesMode(Simulation::CAircraftModel::ModelModeFilter mode) const;
 
             //! Model mode as string
             const QString &getModelModeAsString() const { return modelModeToString(getModelMode()); }
 
             //! Model mode as string
-            const BlackMisc::CIcon &getModelModeAsIcon() const;
+            const CIcon &getModelModeAsIcon() const;
 
             //! Set model mode
             void setModelMode(ModelMode mode) { m_modelMode = mode; }
@@ -369,10 +367,10 @@ namespace BlackMisc
             int calculateScore(const CAircraftModel &compareModel, bool preferColorLiveries) const;
 
             //! Validate
-            BlackMisc::CStatusMessageList validate(bool withNestedObjects) const;
+            CStatusMessageList validate(bool withNestedObjects) const;
 
             //! Considered equal for publishing, compares if livery etc. are the same DB values
-            bool isEqualForPublishing(const CAircraftModel &dbModel, BlackMisc::CStatusMessageList *details = nullptr) const;
+            bool isEqualForPublishing(const CAircraftModel &dbModel, CStatusMessageList *details = nullptr) const;
 
             //! Helper class used by implementation.
             using MemoHelper = CMemoHelper<Aviation::CAircraftIcaoCode, Aviation::CLivery, CDistributor>;
@@ -416,9 +414,9 @@ namespace BlackMisc
             static const QString &autoGenerated();
 
         private:
-            BlackMisc::Aviation::CCallsign m_callsign;             //!< aircraft's callsign if any
-            BlackMisc::Aviation::CAircraftIcaoCode m_aircraftIcao; //!< ICAO code if available
-            BlackMisc::Aviation::CLivery m_livery;                 //!< livery information
+            Aviation::CCallsign m_callsign;             //!< aircraft's callsign if any
+            Aviation::CAircraftIcaoCode m_aircraftIcao; //!< ICAO code if available
+            Aviation::CLivery m_livery;                 //!< livery information
             CSimulatorInfo m_simulator;                            //!< model for given simulator
             CDistributor   m_distributor;                          //!< who designed or distributed the model
             QString        m_modelString;                          //!< Simulator model key, unique
diff --git a/src/blackmisc/simulation/interpolatormulti.cpp b/src/blackmisc/simulation/interpolatormulti.cpp
index 2326c812e..ea1699204 100644
--- a/src/blackmisc/simulation/interpolatormulti.cpp
+++ b/src/blackmisc/simulation/interpolatormulti.cpp
@@ -17,13 +17,13 @@ namespace BlackMisc
 {
     namespace Simulation
     {
-        CInterpolatorMulti::CInterpolatorMulti(const BlackMisc::Aviation::CCallsign &callsign, QObject *parent) :
+        CInterpolatorMulti::CInterpolatorMulti(const CCallsign &callsign, QObject *parent) :
             QObject(parent),
             m_spline(callsign, this),
             m_linear(callsign, this)
         {}
 
-        BlackMisc::Aviation::CAircraftSituation CInterpolatorMulti::getInterpolatedSituation(
+        CAircraftSituation CInterpolatorMulti::getInterpolatedSituation(
             qint64 currentTimeSinceEpoc,
             const CInterpolationAndRenderingSetup &setup,
             const CInterpolationHints &hints, CInterpolationStatus &status)
@@ -37,7 +37,7 @@ namespace BlackMisc
             return {};
         }
 
-        BlackMisc::Aviation::CAircraftParts CInterpolatorMulti::getInterpolatedParts(
+        CAircraftParts CInterpolatorMulti::getInterpolatedParts(
             qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetup &setup, CPartsStatus &partsStatus, bool log)
         {
             switch (m_mode)
@@ -49,7 +49,7 @@ namespace BlackMisc
             return {};
         }
 
-        void CInterpolatorMulti::addAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation)
+        void CInterpolatorMulti::addAircraftSituation(const CAircraftSituation &situation)
         {
             m_linear.addAircraftSituation(situation);
             m_spline.addAircraftSituation(situation);
@@ -66,7 +66,7 @@ namespace BlackMisc
             return false;
         }
 
-        void CInterpolatorMulti::addAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts)
+        void CInterpolatorMulti::addAircraftParts(const CAircraftParts &parts)
         {
             m_linear.addAircraftParts(parts);
             m_spline.addAircraftParts(parts);
diff --git a/src/blackmisc/simulation/interpolatorspline.cpp b/src/blackmisc/simulation/interpolatorspline.cpp
index f440d4391..c247b9fe8 100644
--- a/src/blackmisc/simulation/interpolatorspline.cpp
+++ b/src/blackmisc/simulation/interpolatorspline.cpp
@@ -107,7 +107,10 @@ namespace BlackMisc
                 const auto situationsNewer = makeRange(validSituations.begin(), pivot);
                 const auto situationsOlder = makeRange(pivot, validSituations.end());
 
-                if (situationsNewer.isEmpty() || situationsOlder.size() < 2) { return { *this, 0 }; }
+                if (situationsNewer.isEmpty() || situationsOlder.size() < 2)
+                {
+                    return { *this, 0 };
+                }
 
                 const std::array<CAircraftSituation, 3> s {{ *(situationsOlder.begin() + 1), *situationsOlder.begin(), *(situationsNewer.end() - 1) }};
 
diff --git a/src/blackmisc/simulation/simulatedaircraftlist.h b/src/blackmisc/simulation/simulatedaircraftlist.h
index bcd5b7842..098c13491 100644
--- a/src/blackmisc/simulation/simulatedaircraftlist.h
+++ b/src/blackmisc/simulation/simulatedaircraftlist.h
@@ -36,15 +36,14 @@ namespace BlackMisc
         class CAircraftModel;
         class CSimulatedAircraft;
     }
-
     namespace Simulation
     {
         //! Value object encapsulating a list of aircraft.
         class BLACKMISC_EXPORT CSimulatedAircraftList :
-            public BlackMisc::CSequence<CSimulatedAircraft>,
-            public BlackMisc::Aviation::ICallsignObjectList<CSimulatedAircraft, CSimulatedAircraftList>,
-            public BlackMisc::Geo::IGeoObjectWithRelativePositionList<CSimulatedAircraft, CSimulatedAircraftList>,
-            public BlackMisc::Mixin::MetaType<CSimulatedAircraftList>
+            public CSequence<CSimulatedAircraft>,
+            public Aviation::ICallsignObjectList<CSimulatedAircraft, CSimulatedAircraftList>,
+            public Geo::IGeoObjectWithRelativePositionList<CSimulatedAircraft, CSimulatedAircraftList>,
+            public Mixin::MetaType<CSimulatedAircraftList>
         {
         public:
             BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CSimulatedAircraftList)
@@ -56,7 +55,7 @@ namespace BlackMisc
             CSimulatedAircraftList(const CSequence<CSimulatedAircraft> &other);
 
             //! All pilots (with valid data)
-            BlackMisc::Network::CUserList getPilots() const;
+            Network::CUserList getPilots() const;
 
             //! Enabled / disabled aircraft
             CSimulatedAircraftList findByEnabled(bool enabled) const;
@@ -68,7 +67,7 @@ namespace BlackMisc
             CSimulatedAircraftList findByVtol(bool vtol) const;
 
             //! Callsigns of aircraft with synchronized parts
-            BlackMisc::Aviation::CCallsignSet getCallsignsWithSynchronizedParts() const;
+            Aviation::CCallsignSet getCallsignsWithSynchronizedParts() const;
 
             //! Update aircraft with data from VATSIM data file
             //! \remarks The list used ("this") needs to contain the VATSIM data file objects
@@ -78,28 +77,28 @@ namespace BlackMisc
             void markAllAsNotRendered();
 
             //! Mark given callsign as rendered
-            int setRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, bool onlyFirst = true);
+            int setRendered(const Aviation::CCallsign &callsign, bool rendered, bool onlyFirst = true);
 
             //! Mark given callsign as enabled
-            int setEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabled, bool onlyFirst = true);
+            int setEnabled(const Aviation::CCallsign &callsign, bool enabled, bool onlyFirst = true);
 
             //! Set model
-            int setAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const CAircraftModel &model, bool onlyFirst = true);
+            int setAircraftModel(const Aviation::CCallsign &callsign, const CAircraftModel &model, bool onlyFirst = true);
 
             //! Set aircraft parts
-            int setAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts, bool onlyFirst = true);
+            int setAircraftParts(const Aviation::CCallsign &callsign, const Aviation::CAircraftParts &parts, bool onlyFirst = true);
 
             //! Set aircraft parts
-            int setAircraftSituation(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftSituation &situation, bool onlyFirst = true);
+            int setAircraftSituation(const Aviation::CCallsign &callsign, const Aviation::CAircraftSituation &situation, bool onlyFirst = true);
 
             //! Set ground elevation
-            int setGroundElevation(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAltitude &elevation, bool onlyFirst = true);
+            int setGroundElevation(const Aviation::CCallsign &callsign, const Aviation::CAltitude &elevation, bool onlyFirst = true);
 
             //! Enabled?
-            bool isEnabled(const BlackMisc::Aviation::CCallsign &callsign) const;
+            bool isEnabled(const Aviation::CCallsign &callsign) const;
 
             //! Rendered?
-            bool isRendered(const BlackMisc::Aviation::CCallsign &callsign) const;
+            bool isRendered(const Aviation::CCallsign &callsign) const;
 
             //! Replace or add by callsign
             bool replaceOrAddByCallsign(const CSimulatedAircraft &aircraft);
diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.h b/src/plugins/simulator/fsxcommon/simconnectobject.h
index 3753503e5..e1c325cd3 100644
--- a/src/plugins/simulator/fsxcommon/simconnectobject.h
+++ b/src/plugins/simulator/fsxcommon/simconnectobject.h
@@ -105,13 +105,13 @@ namespace BlackSimPlugin
             //! Adding is confirmed
             bool isConfirmedAdded() const;
 
-            //! Marked as confirmed
+            //! Marked as confirmed, means the simulator has "confirmed" the objectId as added and not instantly removed the object
             void setConfirmedAdded(bool confirm);
 
             //! Removing is pending
             bool isPendingRemoved() const { return m_pendingRemoved; }
 
-            //! Marked as confirmed
+            //! Marked as pending for removal
             void setPendingRemoved(bool pending);
 
             //! VTOL?
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
index 43e408502..886b0a192 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
@@ -362,7 +362,7 @@ namespace BlackSimPlugin
             {
                 CLogMessage(this).warning("FSX: Pitch value (own aircraft) out of limits: %1") << simulatorOwnAircraft.pitch;
             }
-            BlackMisc::Aviation::CAircraftSituation aircraftSituation;
+            CAircraftSituation aircraftSituation;
             aircraftSituation.setPosition(position);
             // MSFS has inverted pitch and bank angles
             aircraftSituation.setPitch(CAngle(-simulatorOwnAircraft.pitch, CAngleUnit::deg()));
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
index 35d6e6f71..a9e56ca13 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
@@ -333,9 +333,9 @@ namespace BlackSimPlugin
             static constexpr int RequestSimDataOffset = 0 * MaxSimObjects;
             static constexpr int RequestLightsOffset  = 1 * MaxSimObjects;
             static constexpr int AddPendingAircraftIntervalMs = 20 * 1000;
-            static constexpr int DispatchIntervalMs = 10; //!< how often with run the FSX event queue
-            static constexpr int DeferSimulatingFlagMs = 1500; //! simulating can jitter at startup (simulating->stopped->simulating, multiple start events), so we defer detection
-            static constexpr int DeferResendingLights = 2500;  //! Resend light state when aircraft light state was not yet available
+            static constexpr int DispatchIntervalMs = 10;      //!< how often with run the FSX event queue
+            static constexpr int DeferSimulatingFlagMs = 1500; //!< simulating can jitter at startup (simulating->stopped->simulating, multiple start events), so we defer detection
+            static constexpr int DeferResendingLights = 2500;  //!< Resend light state when aircraft light state was not yet available
 
             QString m_simConnectVersion;            //!< SimConnect version
             bool m_simConnected  = false;           //!< Is simulator connected?