diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp
index fe35133a2..bb0f0921f 100644
--- a/src/blackcore/airspacemonitor.cpp
+++ b/src/blackcore/airspacemonitor.cpp
@@ -382,8 +382,7 @@ namespace BlackCore
             const CUserList usersByCallsign = sApp->getWebDataServices()->getUsersForCallsign(callsign);
             if (usersByCallsign.isEmpty())
             {
-                CUser user;
-                user.setCallsign(callsign);
+                const CUser user(callsign);
                 users.push_back(user);
             }
             else
@@ -1040,9 +1039,11 @@ namespace BlackCore
         this->onCustomFSInnPacketReceived(callsign, packet.airlineIcaoDesignator, packet.aircraftIcaoDesignator, packet.combinedCode, packet.modelString);
     }
 
-    CSimulatedAircraft CAirspaceMonitor::addOrUpdateAircraftInRange(const CCallsign &callsign, const QString &aircraftIcao, const QString &airlineIcao, const QString &livery, const QString &modelString, CAircraftModel::ModelType type, CStatusMessageList *log)
+    CSimulatedAircraft CAirspaceMonitor::addOrUpdateAircraftInRange(
+        const CCallsign &callsign, const QString &aircraftIcao, const QString &airlineIcao, const QString &livery,
+        const QString &modelString, CAircraftModel::ModelType modelType, CStatusMessageList *log)
     {
-        CAircraftModel model = this->reverseLookupModelWithFlightplanData(callsign, aircraftIcao, airlineIcao, livery, modelString, type, log);
+        CAircraftModel model = this->reverseLookupModelWithFlightplanData(callsign, aircraftIcao, airlineIcao, livery, modelString, modelType, log);
         const CSimulatedAircraft aircraft = this->getAircraftInRangeForCallsign(callsign);
 
         if (aircraft.hasValidCallsign())
@@ -1367,5 +1368,4 @@ namespace BlackCore
     CAirspaceMonitor::FsInnPacket::FsInnPacket(const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &combinedCode, const QString &modelString) :
         aircraftIcaoDesignator(aircraftIcaoDesignator.trimmed().toUpper()), airlineIcaoDesignator(airlineIcaoDesignator.trimmed().toUpper()), combinedCode(combinedCode.trimmed().toUpper()), modelString(modelString.trimmed())
     { }
-
 } // namespace
diff --git a/src/blackcore/airspacemonitor.h b/src/blackcore/airspacemonitor.h
index c91575c5c..5564ac377 100644
--- a/src/blackcore/airspacemonitor.h
+++ b/src/blackcore/airspacemonitor.h
@@ -315,7 +315,7 @@ namespace BlackCore
         BlackMisc::Simulation::CSimulatedAircraft addOrUpdateAircraftInRange(
             const BlackMisc::Aviation::CCallsign &callsign,
             const QString &aircraftIcao, const QString &airlineIcao, const QString &livery, const QString &modelString,
-            BlackMisc::Simulation::CAircraftModel::ModelType,
+            BlackMisc::Simulation::CAircraftModel::ModelType modelType,
             BlackMisc::CStatusMessageList *log = nullptr);
 
         //! Update aircraft
diff --git a/src/blackmisc/simulation/matchingutils.h b/src/blackmisc/simulation/matchingutils.h
index 35d84ce76..7a72e4812 100644
--- a/src/blackmisc/simulation/matchingutils.h
+++ b/src/blackmisc/simulation/matchingutils.h
@@ -40,7 +40,6 @@ namespace BlackMisc
                 const QString &message, const BlackMisc::CLogCategoryList &categories = {},
                 BlackMisc::CStatusMessage::StatusSeverity s = BlackMisc::CStatusMessage::SeverityInfo);
 
-
             //! Specialized log message for matching / reverse lookup
             //! \threadsafe
             static BlackMisc::CStatusMessage logMessage(