diff --git a/src/blackcore/context_application_proxy.cpp b/src/blackcore/context_application_proxy.cpp
index 442a9a4e6..c860b8376 100644
--- a/src/blackcore/context_application_proxy.cpp
+++ b/src/blackcore/context_application_proxy.cpp
@@ -24,8 +24,6 @@ namespace BlackCore
     CContextApplicationProxy::CContextApplicationProxy(const QString &serviceName, QDBusConnection &connection, CRuntimeConfig::ContextMode mode, CRuntime *runtime) : IContextApplication(mode, runtime), m_dBusInterface(nullptr)
     {
         this->m_dBusInterface = new CGenericDBusInterface(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), connection, this);
-
-        // this->m_dBusInterface = new CGenericDBusInterface(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), connection, this);
         this->relaySignals(serviceName, connection);
 
         connect(this, &IContextApplication::messageLogged, this, [](const CStatusMessage & message, const CIdentifier & origin)
diff --git a/src/blackcore/context_audio_empty.h b/src/blackcore/context_audio_empty.h
index 70e735116..4bfc58910 100644
--- a/src/blackcore/context_audio_empty.h
+++ b/src/blackcore/context_audio_empty.h
@@ -25,7 +25,6 @@ namespace BlackCore
     class BLACKCORE_EXPORT CContextAudioEmpty : public IContextAudio
     {
     public:
-
         //! Constructor
         CContextAudioEmpty(CRuntime *runtime) : IContextAudio(CRuntimeConfig::NotUsed, runtime) {}
 
@@ -175,8 +174,7 @@ namespace BlackCore
             logEmptyContextWarning(Q_FUNC_INFO);
             return false;
         }
-
-    };
+        };
 } // namespace
 
 #endif // guard
diff --git a/src/blackcore/context_network_empty.h b/src/blackcore/context_network_empty.h
index b75775a6e..5318464d9 100644
--- a/src/blackcore/context_network_empty.h
+++ b/src/blackcore/context_network_empty.h
@@ -25,7 +25,6 @@ namespace BlackCore
         Q_OBJECT
 
     public:
-
         //! Constructor
         CContextNetworkEmpty(CRuntime *runtime) : IContextNetwork(CRuntimeConfig::NotUsed, runtime) {}
 
diff --git a/src/blackcore/context_ownaircraft_impl.h b/src/blackcore/context_ownaircraft_impl.h
index 4847784e4..3cfeeb22c 100644
--- a/src/blackcore/context_ownaircraft_impl.h
+++ b/src/blackcore/context_ownaircraft_impl.h
@@ -154,6 +154,6 @@ namespace BlackCore
         //! Resolve voice rooms
         void resolveVoiceRooms();
     };
-}
+} // ns
 
 #endif // guard
diff --git a/src/blackcore/context_ownaircraft_proxy.h b/src/blackcore/context_ownaircraft_proxy.h
index ae83df770..2313a9954 100644
--- a/src/blackcore/context_ownaircraft_proxy.h
+++ b/src/blackcore/context_ownaircraft_proxy.h
@@ -28,12 +28,10 @@ namespace BlackCore
         friend class IContextOwnAircraft;
 
     public:
-
         //! Destructor
         virtual ~CContextOwnAircraftProxy() {}
 
-    public slots: // IContextOwnAircraft overrides
-
+    public slots:
         //! \copydoc IContextOwnAircraft::getOwnAircraft()
         virtual BlackMisc::Simulation::CSimulatedAircraft getOwnAircraft() const override;
 
@@ -82,9 +80,7 @@ namespace BlackCore
 
         //! \brief Relay connection signals to local signals.
         void relaySignals(const QString &serviceName, QDBusConnection &connection);
-
-
     };
-}
+} // ns
 
 #endif // guard
diff --git a/src/blackcore/dbus_server.cpp b/src/blackcore/dbus_server.cpp
index 6e484de7b..9bb053d3f 100644
--- a/src/blackcore/dbus_server.cpp
+++ b/src/blackcore/dbus_server.cpp
@@ -301,7 +301,7 @@ namespace BlackCore
      */
     QString CDBusServer::fixAddressToDBusAddress(const QString &address)
     {
-        if (address.isEmpty() || address == sessionDBusServer() || address == systemDBusServer()) return address;
+        if (address.isEmpty() || address == sessionDBusServer() || address == systemDBusServer()) { return address; }
         if (address.startsWith("tcp:") || address.startsWith("unix:")) return address;
         return p2pAddress(address);
     }
diff --git a/src/blackgui/components/settingshotkeycomponent.ui b/src/blackgui/components/settingshotkeycomponent.ui
index 4268827b1..306af8e49 100644
--- a/src/blackgui/components/settingshotkeycomponent.ui
+++ b/src/blackgui/components/settingshotkeycomponent.ui
@@ -51,7 +51,7 @@
     </widget>
    </item>
    <item row="1" column="0">
-    <spacer name="horizontalSpacer">
+    <spacer name="hs_HotkeyComponent">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
@@ -83,7 +83,7 @@
     </widget>
    </item>
    <item row="3" column="1">
-    <spacer name="verticalSpacer_2">
+    <spacer name="vs_HotkeyComponent">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
diff --git a/src/blackgui/models/atcstationlistmodel.cpp b/src/blackgui/models/atcstationlistmodel.cpp
index 9d2ca2173..c752d5004 100644
--- a/src/blackgui/models/atcstationlistmodel.cpp
+++ b/src/blackgui/models/atcstationlistmodel.cpp
@@ -21,9 +21,6 @@ namespace BlackGui
 {
     namespace Models
     {
-        /*
-         * Constructor
-         */
         CAtcStationListModel::CAtcStationListModel(AtcStationMode stationMode, QObject *parent) :
             CListModelBase("ModelAtcList", parent), m_stationMode(NotSet)
         {
diff --git a/src/blackmisc/aviation/atcstation.cpp b/src/blackmisc/aviation/atcstation.cpp
index 4210be32d..52fed937b 100644
--- a/src/blackmisc/aviation/atcstation.cpp
+++ b/src/blackmisc/aviation/atcstation.cpp
@@ -24,7 +24,6 @@ namespace BlackMisc
 {
     namespace Aviation
     {
-
         CAtcStation::CAtcStation()
         { }
 
diff --git a/src/blackmisc/geo/coordinategeodetic.h b/src/blackmisc/geo/coordinategeodetic.h
index 0f640bb83..665c0cca4 100644
--- a/src/blackmisc/geo/coordinategeodetic.h
+++ b/src/blackmisc/geo/coordinategeodetic.h
@@ -131,7 +131,7 @@ namespace BlackMisc
             //! Constructor
             ICoordinateWithRelativePosition();
 
-            BlackMisc::PhysicalQuantities::CAngle  m_bearingToOwnAircraft  {0.0, BlackMisc::PhysicalQuantities::CAngleUnit::nullUnit()}; //!< temporary stored value
+            BlackMisc::PhysicalQuantities::CAngle  m_bearingToOwnAircraft  {0.0, BlackMisc::PhysicalQuantities::CAngleUnit::nullUnit()};  //!< temporary stored value
             BlackMisc::PhysicalQuantities::CLength m_distanceToOwnAircraft {0.0, BlackMisc::PhysicalQuantities::CLengthUnit::nullUnit()}; //!< temporary stored value
         };
 
diff --git a/src/blackmisc/geo/geoobjectlist.h b/src/blackmisc/geo/geoobjectlist.h
index e42f4f63b..3619939d5 100644
--- a/src/blackmisc/geo/geoobjectlist.h
+++ b/src/blackmisc/geo/geoobjectlist.h
@@ -45,17 +45,13 @@ namespace BlackMisc
         class IGeoObjectList
         {
         public:
-            /*!
-             * Find 0..n objects within range of given coordinate
-             * \param coordinate    other position
-             * \param range         within range of other position
-             * \return
-             */
+            //! Find 0..n objects within range of given coordinate
+            //! \param coordinate    other position
+            //! \param range         within range of other position
+            //! \return
             CONTAINER findWithinRange(const BlackMisc::Geo::ICoordinateGeodetic &coordinate, const BlackMisc::PhysicalQuantities::CLength &range) const;
 
-            /*!
-             * Find 0..n objects closest to the given coordinate.
-             */
+            //! Find 0..n objects closest to the given coordinate.
             CONTAINER findClosest(int number, const BlackMisc::Geo::ICoordinateGeodetic &coordinate) const;
 
         protected:
@@ -102,7 +98,6 @@ namespace BlackMisc
         protected:
             //! Constructor
             IGeoObjectWithRelativePositionList();
-
         };
 
         //! \cond PRIVATE