diff --git a/middleware/Auth/DefaultAuthMiddleware.php b/middleware/Auth/DefaultAuthMiddleware.php
index a726a4d5..ee1267cd 100644
--- a/middleware/Auth/DefaultAuthMiddleware.php
+++ b/middleware/Auth/DefaultAuthMiddleware.php
@@ -13,14 +13,14 @@ class DefaultAuthMiddleware extends BaseAuthMiddleware
 		if ($this->IsApiRoute)
 		{
 			// Session cookie or API Key is ok
-			$auth = new ApiKeyAuthMiddleware($this->AppContainer, $this->ResponseFactory);
+			$auth = new SessionAuthMiddleware($this->AppContainer, $this->ResponseFactory);
 			$user = $auth->AuthenticateRequest($request);
 			if ($user !== null)
 			{
 				return $user;
 			}
 
-			$auth = new SessionAuthMiddleware($this->AppContainer, $this->ResponseFactory);
+			$auth = new ApiKeyAuthMiddleware($this->AppContainer, $this->ResponseFactory);
 			$user = $auth->AuthenticateRequest($request);
 			return $user;
 		}
diff --git a/middleware/Auth/ReverseProxyAuthMiddleware.php b/middleware/Auth/ReverseProxyAuthMiddleware.php
index 3a6426e1..c7906ce6 100644
--- a/middleware/Auth/ReverseProxyAuthMiddleware.php
+++ b/middleware/Auth/ReverseProxyAuthMiddleware.php
@@ -12,7 +12,7 @@ class ReverseProxyAuthMiddleware extends BaseAuthMiddleware
 	{
 		define('GROCY_EXTERNALLY_MANAGED_AUTHENTICATION', true);
 
-		// When the reverse proxy is configured to be bypassed for API routes, try to use regular ApiKeyAuth
+		// Try to use regular API Key authentiaction (applies when the reverse proxy is configured to be bypassed for API routes)
 		if ($this->IsApiRoute)
 		{
 			$auth = new ApiKeyAuthMiddleware($this->AppContainer, $this->ResponseFactory);
diff --git a/middleware/BaseMiddleware.php b/middleware/BaseMiddleware.php
index 5bac70cd..1f42e857 100644
--- a/middleware/BaseMiddleware.php
+++ b/middleware/BaseMiddleware.php
@@ -15,7 +15,7 @@ class BaseMiddleware
 		$this->ApplicationService = ApplicationService::GetInstance();
 	}
 
-	protected $AppContainer;
-	protected $ResponseFactory;
-	protected $ApplicationService;
+	protected Container $AppContainer;
+	protected ResponseFactoryInterface $ResponseFactory;
+	protected ApplicationService $ApplicationService;
 }
diff --git a/middleware/LocaleMiddleware.php b/middleware/LocaleMiddleware.php
index 94271f54..6bb4bfdc 100644
--- a/middleware/LocaleMiddleware.php
+++ b/middleware/LocaleMiddleware.php
@@ -18,7 +18,7 @@ class LocaleMiddleware extends BaseMiddleware
 
 	private function GetLocale(Request $request)
 	{
-		// demo and prerelease modes are fixed to the default locale
+		// Demo and Prerelease modes are fixed to the default locale
 		if (GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease')
 		{
 			return GROCY_DEFAULT_LOCALE;
@@ -28,7 +28,6 @@ class LocaleMiddleware extends BaseMiddleware
 		if (defined('GROCY_AUTHENTICATED') && GROCY_AUTHENTICATED)
 		{
 			$locale = UsersService::GetInstance()->GetUserSetting(GROCY_USER_ID, 'locale');
-
 			if (isset($locale) && !empty($locale))
 			{
 				if (in_array($locale, scandir(__DIR__ . '/../localization')))