diff --git a/src/Application.cpp b/src/Application.cpp
index 41eb19ea..0eef2111 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -31,11 +31,10 @@ int Application::run(const std::vector<std::string>& arguments) {
 
                 this->shutdown();
                 return returnValue;
-
-            } else {
-                // If the first argument didn't map to a command, we assume it's an environment name
-                this->selectedEnvironmentName = firstArg;
             }
+
+            // If the first argument didn't map to a command, we assume it's an environment name
+            this->selectedEnvironmentName = firstArg;
         }
 
 #ifdef BLOOM_DEBUG_BUILD
diff --git a/src/Application.hpp b/src/Application.hpp
index fe974837..c85a2e41 100644
--- a/src/Application.hpp
+++ b/src/Application.hpp
@@ -9,19 +9,19 @@
 
 #include "src/Helpers/Thread.hpp"
 
-#include "src/SignalHandler/SignalHandler.hpp"
 #include "src/TargetController/TargetController.hpp"
 #include "src/DebugServers/GdbRsp/AvrGdbRsp/AvrGdbRsp.hpp"
 #include "src/Insight/Insight.hpp"
+#include "src/SignalHandler/SignalHandler.hpp"
 
-#include "src/Logger/Logger.hpp"
 #include "src/ProjectConfig.hpp"
 #include "src/ProjectSettings.hpp"
-#include "src/VersionNumber.hpp"
 
 #include "src/EventManager/EventListener.hpp"
 #include "src/EventManager/Events/Events.hpp"
 
+#include "src/VersionNumber.hpp"
+
 namespace Bloom
 {
     /**
diff --git a/src/ProjectConfig.hpp b/src/ProjectConfig.hpp
index 572b77f2..85877c7c 100644
--- a/src/ProjectConfig.hpp
+++ b/src/ProjectConfig.hpp
@@ -137,7 +137,7 @@ namespace Bloom
      * Configuration relating to a specific user defined environment.
      *
      * An instance of this type will be instantiated for each environment defined in the user's config file.
-     * See Application::extractConfig() implementation for more on this.
+     * See Application::loadProjectConfiguration() implementation for more on this.
      */
     struct EnvironmentConfig
     {