diff --git a/scwx-qt/source/scwx/qt/manager/marker_manager.cpp b/scwx-qt/source/scwx/qt/manager/marker_manager.cpp
index 798f94b2..fd7bee13 100644
--- a/scwx-qt/source/scwx/qt/manager/marker_manager.cpp
+++ b/scwx-qt/source/scwx/qt/manager/marker_manager.cpp
@@ -470,7 +470,7 @@ std::optional<types::MarkerIconInfo>
 MarkerManager::get_icon(const std::string& name)
 {
    const std::shared_lock lock(p->markerIconsLock_);
-   auto it = p->markerIcons_.find(name);
+   auto                   it = p->markerIcons_.find(name);
    if (it != p->markerIcons_.end())
    {
       return it->second;
diff --git a/scwx-qt/source/scwx/qt/manager/resource_manager.cpp b/scwx-qt/source/scwx/qt/manager/resource_manager.cpp
index 5299d6ff..c6c40a26 100644
--- a/scwx-qt/source/scwx/qt/manager/resource_manager.cpp
+++ b/scwx-qt/source/scwx/qt/manager/resource_manager.cpp
@@ -110,8 +110,8 @@ static void LoadTextures()
 
 void BuildAtlas()
 {
-      util::TextureAtlas& textureAtlas = util::TextureAtlas::Instance();
-      textureAtlas.BuildAtlas(atlasWidth, atlasHeight);
+   util::TextureAtlas& textureAtlas = util::TextureAtlas::Instance();
+   textureAtlas.BuildAtlas(atlasWidth, atlasHeight);
 }
 
 } // namespace ResourceManager
diff --git a/scwx-qt/source/scwx/qt/map/map_widget.cpp b/scwx-qt/source/scwx/qt/map/map_widget.cpp
index c5c07b56..0e9846dd 100644
--- a/scwx-qt/source/scwx/qt/map/map_widget.cpp
+++ b/scwx-qt/source/scwx/qt/map/map_widget.cpp
@@ -219,7 +219,7 @@ public:
    std::shared_ptr<model::LayerModel> layerModel_ {
       model::LayerModel::Instance()};
 
-   ui::EditMarkerDialog* editMarkerDialog_;
+   ui::EditMarkerDialog* editMarkerDialog_ {nullptr};
 
    std::shared_ptr<manager::HotkeyManager> hotkeyManager_ {
       manager::HotkeyManager::Instance()};
diff --git a/scwx-qt/source/scwx/qt/types/marker_types.hpp b/scwx-qt/source/scwx/qt/types/marker_types.hpp
index f8b1c710..661aa207 100644
--- a/scwx-qt/source/scwx/qt/types/marker_types.hpp
+++ b/scwx-qt/source/scwx/qt/types/marker_types.hpp
@@ -50,9 +50,9 @@ struct MarkerIconInfo
        qIcon {QIcon(QString::fromStdString(path))},
        image {}
    {
-      auto qName = QString::fromStdString(name);
+      auto        qName = QString::fromStdString(name);
       QStringList parts = qName.split("location-");
-      shortName = parts.last().toStdString();
+      shortName         = parts.last().toStdString();
    }
 
    // Initializer for custom icons (which use a file path)