diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.cpp b/src/plugins/simulator/fscommon/simulatorfscommon.cpp
index 5dd9957bb..b9c040680 100644
--- a/src/plugins/simulator/fscommon/simulatorfscommon.cpp
+++ b/src/plugins/simulator/fscommon/simulatorfscommon.cpp
@@ -92,7 +92,7 @@ namespace BlackSimPlugin
         bool CSimulatorFsCommon::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft)
         {
             // remove upfront, and then enable / disable again
-            auto callsign = aircraft.getCallsign();
+            const auto callsign = aircraft.getCallsign();
             if (!isPhysicallyRenderedAircraft(callsign)) { return false; }
             this->physicallyRemoveRemoteAircraft(callsign);
             return this->changeRemoteAircraftEnabled(aircraft);
diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.h b/src/plugins/simulator/fscommon/simulatorfscommon.h
index ae1e257ce..866cc2ec6 100644
--- a/src/plugins/simulator/fscommon/simulatorfscommon.h
+++ b/src/plugins/simulator/fscommon/simulatorfscommon.h
@@ -30,35 +30,21 @@ namespace BlackSimPlugin
             //! Destructor
             virtual ~CSimulatorFsCommon();
 
-            //! \copydoc BlackCore::ISimulator::disconnectFrom()
-            virtual bool disconnectFrom() override;
-
             //! FSUIPC connected?
             bool isFsuipcConnected() const;
 
-            //! \copydoc BlackCore::ISimulator::isPaused
+            //! \name ISimulator interface implementations
+            //! @{
+            virtual bool disconnectFrom() override;
             virtual bool isPaused() const override { return m_simPaused; }
-
-            //! \copydoc BlackCore::ISimulator::isTimeSynchronized
             virtual bool isTimeSynchronized() const override { return m_simTimeSynced; }
-
-            //! \copydoc BlackCore::ISimulator::getTimeSynchronizationOffset
             virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const override;
-
-            //! \copydoc BlackCore::ISimulator::setTimeSynchronization
             virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override;
-
-            //! \copydoc BlackCore::ISimulator::getAirportsInRange
             virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const override;
-
-            //! \copydoc BlackCore::ISimulator::changeRemoteAircraftModel
             virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft) override;
-
-            //! \copydoc BlackCore::ISimulator::changeRemoteAircraftEnabled
             virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft) override;
-
-            //! \copydoc BlackCore::ISimulator::enableDebugMessages
             virtual void enableDebugMessages(bool driver, bool interpolator) override;
+            //! @}
 
         protected:
             //! Constructor