diff --git a/build/distributed/udevrules/99-bloom.rules b/build/distributed/udevrules/99-bloom.rules
index 394f7f11..6f83cbc4 100644
--- a/build/distributed/udevrules/99-bloom.rules
+++ b/build/distributed/udevrules/99-bloom.rules
@@ -45,7 +45,7 @@ ACTION=="add", ATTR{idVendor}=="04d8", ATTR{idProduct}=="9019", MODE="0666"
 # WCH-LinkE
 ACTION=="add", ATTR{idVendor}=="1a86", ATTR{idProduct}=="8010", MODE="0666"
 
-# WCH-LinkE IAP mode
+# WCH-LinkE (IAP mode)
 ACTION=="add", ATTR{idVendor}=="4348", ATTR{idProduct}=="55e0", MODE="0666"
 
 LABEL="bloom_end"
diff --git a/src/Application.cpp b/src/Application.cpp
index d0c7675b..d27d143c 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -37,14 +37,12 @@ int Application::run() {
             const auto commandHandlerIt = commandHandlersByCommandName.find(firstArg);
 
             if (commandHandlerIt != commandHandlersByCommandName.end()) {
-                // User has passed an argument that maps to a command callback - invoke the callback and shutdown
                 const auto returnValue = commandHandlerIt->second();
 
                 this->shutdown();
                 return returnValue;
             }
 
-            // If the first argument didn't map to a command, we assume it's an environment name
             this->selectedEnvironmentName = std::move(firstArg);
         }
 
diff --git a/src/DebugServer/Gdb/GdbRspDebugServer.hpp b/src/DebugServer/Gdb/GdbRspDebugServer.hpp
index a6adcdac..d002fa6a 100644
--- a/src/DebugServer/Gdb/GdbRspDebugServer.hpp
+++ b/src/DebugServer/Gdb/GdbRspDebugServer.hpp
@@ -74,15 +74,6 @@
 
 namespace DebugServer::Gdb
 {
-    /**
-     * The GdbRspDebugServer is an implementation of the GDB Remote Serial Protocol.
-     *
-     * This server employs TCP/IP sockets to interface with GDB clients. The listening address and port can be
-     * configured in the user's project config file.
-     *
-     * See https://sourceware.org/gdb/onlinedocs/gdb/Remote-Protocol.html for more info on the GDB Remote Serial
-     * Protocol.
-     */
     template<
         typename GdbTargetDescriptorType,
         typename DebugSessionType,
@@ -288,10 +279,10 @@ namespace DebugServer::Gdb
                 Logger::debug("GDB RSP interrupted");
                 return;
 
-            } catch (const ::Exceptions::FatalErrorException& exception) {
+            } catch (const ::Exceptions::FatalErrorException&) {
                 Logger::error("Fatal error occurred - closing connection");
                 this->endDebugSession();
-                throw exception;
+                throw;
             }
         }
 
@@ -567,9 +558,9 @@ namespace DebugServer::Gdb
                 Logger::debug("GDB RSP interrupted");
                 return;
 
-            } catch (const ::Exceptions::FatalErrorException& exception) {
+            } catch (const ::Exceptions::FatalErrorException&) {
                 this->endDebugSession();
-                throw exception;
+                throw;
 
             } catch (const ::Exceptions::Exception& exception) {
                 Logger::error("Failed to handle target execution state changed event - " + exception.getMessage());
diff --git a/src/DebugToolDrivers/WCH/WchLinkBase.cpp b/src/DebugToolDrivers/WCH/WchLinkBase.cpp
index 19b439ad..306a6d37 100644
--- a/src/DebugToolDrivers/WCH/WchLinkBase.cpp
+++ b/src/DebugToolDrivers/WCH/WchLinkBase.cpp
@@ -1,6 +1,7 @@
 #include "WchLinkBase.hpp"
 
 #include <chrono>
+#include <array>
 
 #include "Protocols/WchLink/WchLinkInterface.hpp"
 
diff --git a/src/main.cpp b/src/main.cpp
index 3d6aaf63..5fe51b7d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,9 +1,5 @@
-#include <string>
-#include <vector>
-
 #include "Application.hpp"
 
 int main(int argc, char* argv[]) {
-    auto application = Application(std::vector<std::string>(argv, argv + argc));
-    return application.run();
+    return Application{{argv, argv + argc}}.run();
 }