diff --git a/app.php b/app.php
index 45ddce71..9d913d98 100644
--- a/app.php
+++ b/app.php
@@ -1,8 +1,8 @@
 <?php
 
 use Grocy\Controllers\ExceptionController;
-use Grocy\Helpers\UrlManager;
 use Grocy\Helpers\SlimBladeView;
+use Grocy\Helpers\UrlManager;
 use Grocy\Middleware\LocaleMiddleware;
 use Psr\Container\ContainerInterface as Container;
 use Slim\Factory\AppFactory;
diff --git a/controllers/Api/BatteriesApiController.php b/controllers/Api/BatteriesApiController.php
index 8b400b9d..efd827f3 100644
--- a/controllers/Api/BatteriesApiController.php
+++ b/controllers/Api/BatteriesApiController.php
@@ -3,8 +3,8 @@
 namespace Grocy\Controllers\Api;
 
 use Grocy\Controllers\Users\User;
-use Grocy\Helpers\WebhookRunner;
 use Grocy\Helpers\Grocycode;
+use Grocy\Helpers\WebhookRunner;
 use Grocy\Services\BatteriesService;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
diff --git a/controllers/Api/CalendarApiController.php b/controllers/Api/CalendarApiController.php
index 62d5693c..aeedfadf 100644
--- a/controllers/Api/CalendarApiController.php
+++ b/controllers/Api/CalendarApiController.php
@@ -2,8 +2,6 @@
 
 namespace Grocy\Controllers\Api;
 
-use Grocy\Services\CalendarService;
-use Grocy\Services\ApiKeyService;
 use Eluceo\iCal\Domain\Entity\Calendar;
 use Eluceo\iCal\Domain\Entity\Event;
 use Eluceo\iCal\Domain\Entity\TimeZone;
@@ -12,6 +10,8 @@ use Eluceo\iCal\Domain\ValueObject\DateTime;
 use Eluceo\iCal\Domain\ValueObject\SingleDay;
 use Eluceo\iCal\Domain\ValueObject\TimeSpan;
 use Eluceo\iCal\Presentation\Factory\CalendarFactory;
+use Grocy\Services\ApiKeyService;
+use Grocy\Services\CalendarService;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
diff --git a/controllers/Api/ChoresApiController.php b/controllers/Api/ChoresApiController.php
index eb5d0cbb..d78c944a 100644
--- a/controllers/Api/ChoresApiController.php
+++ b/controllers/Api/ChoresApiController.php
@@ -3,8 +3,8 @@
 namespace Grocy\Controllers\Api;
 
 use Grocy\Controllers\Users\User;
-use Grocy\Helpers\WebhookRunner;
 use Grocy\Helpers\Grocycode;
+use Grocy\Helpers\WebhookRunner;
 use Grocy\Services\ChoresService;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
diff --git a/controllers/Api/GenericEntityApiController.php b/controllers/Api/GenericEntityApiController.php
index 58a42fc3..8cd81a42 100644
--- a/controllers/Api/GenericEntityApiController.php
+++ b/controllers/Api/GenericEntityApiController.php
@@ -4,8 +4,8 @@ namespace Grocy\Controllers\Api;
 
 use Grocy\Controllers\Users\User;
 use Grocy\Services\StockService;
-use Grocy\Services\UsersService;
 use Grocy\Services\UserfieldsService;
+use Grocy\Services\UsersService;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
diff --git a/controllers/Api/RecipesApiController.php b/controllers/Api/RecipesApiController.php
index d6362a81..04b7f9e7 100644
--- a/controllers/Api/RecipesApiController.php
+++ b/controllers/Api/RecipesApiController.php
@@ -3,8 +3,8 @@
 namespace Grocy\Controllers\Api;
 
 use Grocy\Controllers\Users\User;
-use Grocy\Helpers\WebhookRunner;
 use Grocy\Helpers\Grocycode;
+use Grocy\Helpers\WebhookRunner;
 use Grocy\Services\RecipesService;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
diff --git a/controllers/Api/StockApiController.php b/controllers/Api/StockApiController.php
index 6c95450c..12d3fc8e 100644
--- a/controllers/Api/StockApiController.php
+++ b/controllers/Api/StockApiController.php
@@ -3,10 +3,10 @@
 namespace Grocy\Controllers\Api;
 
 use Grocy\Controllers\Users\User;
+use Grocy\Helpers\Grocycode;
+use Grocy\Helpers\WebhookRunner;
 use Grocy\Services\LocalizationService;
 use Grocy\Services\StockService;
-use Grocy\Helpers\WebhookRunner;
-use Grocy\Helpers\Grocycode;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
diff --git a/controllers/BaseController.php b/controllers/BaseController.php
index 4ba70b30..c7c4ebf1 100644
--- a/controllers/BaseController.php
+++ b/controllers/BaseController.php
@@ -2,12 +2,12 @@
 
 namespace Grocy\Controllers;
 
+use DI\Container;
 use Grocy\Controllers\Users\User;
 use Grocy\Services\ApplicationService;
 use Grocy\Services\DatabaseService;
 use Grocy\Services\LocalizationService;
 use Grocy\Services\UsersService;
-use DI\Container;
 
 class BaseController
 {
diff --git a/controllers/BatteriesController.php b/controllers/BatteriesController.php
index e96208dc..db51c19b 100644
--- a/controllers/BatteriesController.php
+++ b/controllers/BatteriesController.php
@@ -4,8 +4,8 @@ namespace Grocy\Controllers;
 
 use Grocy\Helpers\Grocycode;
 use Grocy\Services\BatteriesService;
-use Grocy\Services\UsersService;
 use Grocy\Services\UserfieldsService;
+use Grocy\Services\UsersService;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
diff --git a/controllers/ChoresController.php b/controllers/ChoresController.php
index 79f573c5..bcb53a42 100644
--- a/controllers/ChoresController.php
+++ b/controllers/ChoresController.php
@@ -4,8 +4,8 @@ namespace Grocy\Controllers;
 
 use Grocy\Helpers\Grocycode;
 use Grocy\Services\ChoresService;
-use Grocy\Services\UsersService;
 use Grocy\Services\UserfieldsService;
+use Grocy\Services\UsersService;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
diff --git a/controllers/ExceptionController.php b/controllers/ExceptionController.php
index 216d01c6..2b95e42e 100644
--- a/controllers/ExceptionController.php
+++ b/controllers/ExceptionController.php
@@ -2,9 +2,9 @@
 
 namespace Grocy\Controllers;
 
+use DI\Container;
 use Grocy\Controllers\Api\BaseApiController;
 use Grocy\Services\ApplicationService;
-use DI\Container;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
diff --git a/controllers/RecipesController.php b/controllers/RecipesController.php
index f0df6eb7..8366bb9e 100644
--- a/controllers/RecipesController.php
+++ b/controllers/RecipesController.php
@@ -2,10 +2,10 @@
 
 namespace Grocy\Controllers;
 
+use Grocy\Helpers\Grocycode;
 use Grocy\Services\RecipesService;
 use Grocy\Services\StockService;
 use Grocy\Services\UserfieldsService;
-use Grocy\Helpers\Grocycode;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
diff --git a/controllers/StockController.php b/controllers/StockController.php
index fe62f829..cbf0b81c 100644
--- a/controllers/StockController.php
+++ b/controllers/StockController.php
@@ -2,13 +2,13 @@
 
 namespace Grocy\Controllers;
 
+use DI\Container;
 use Grocy\Helpers\Grocycode;
 use Grocy\Services\LocalizationService;
 use Grocy\Services\RecipesService;
 use Grocy\Services\StockService;
-use Grocy\Services\UsersService;
 use Grocy\Services\UserfieldsService;
-use DI\Container;
+use Grocy\Services\UsersService;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
diff --git a/controllers/TasksController.php b/controllers/TasksController.php
index b2b18b8b..5b03e734 100644
--- a/controllers/TasksController.php
+++ b/controllers/TasksController.php
@@ -3,8 +3,8 @@
 namespace Grocy\Controllers;
 
 use Grocy\Services\TasksService;
-use Grocy\Services\UsersService;
 use Grocy\Services\UserfieldsService;
+use Grocy\Services\UsersService;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
diff --git a/helpers/UrlManager.php b/helpers/UrlManager.php
index af83476d..7641c232 100644
--- a/helpers/UrlManager.php
+++ b/helpers/UrlManager.php
@@ -24,9 +24,8 @@ class UrlManager
 		{
 			return rtrim($this->BasePath, '/') . $relativePath;
 		}
-		else
-		{ // Is not a resource and URL rewriting is disabled
-			return rtrim($this->BasePath, '/') . '/index.php' . $relativePath;
+		else // Is not a resource and URL rewriting is disabled
+		{return rtrim($this->BasePath, '/') . '/index.php' . $relativePath;
 		}
 	}
 
diff --git a/middleware/ApiKeyAuthMiddleware.php b/middleware/ApiKeyAuthMiddleware.php
index a59e5d36..6345b33d 100644
--- a/middleware/ApiKeyAuthMiddleware.php
+++ b/middleware/ApiKeyAuthMiddleware.php
@@ -2,8 +2,8 @@
 
 namespace Grocy\Middleware;
 
-use Grocy\Services\ApiKeyService;
 use DI\Container;
+use Grocy\Services\ApiKeyService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Slim\Routing\RouteContext;
diff --git a/middleware/BaseMiddleware.php b/middleware/BaseMiddleware.php
index c3831fd9..5bac70cd 100644
--- a/middleware/BaseMiddleware.php
+++ b/middleware/BaseMiddleware.php
@@ -2,8 +2,8 @@
 
 namespace Grocy\Middleware;
 
-use Grocy\Services\ApplicationService;
 use DI\Container;
+use Grocy\Services\ApplicationService;
 use Psr\Http\Message\ResponseFactoryInterface;
 
 class BaseMiddleware
diff --git a/middleware/LdapAuthMiddleware.php b/middleware/LdapAuthMiddleware.php
index 98c2d614..b99f951b 100644
--- a/middleware/LdapAuthMiddleware.php
+++ b/middleware/LdapAuthMiddleware.php
@@ -3,8 +3,8 @@
 namespace Grocy\Middleware;
 
 use Grocy\Services\DatabaseService;
-use Grocy\Services\UsersService;
 use Grocy\Services\SessionService;
+use Grocy\Services\UsersService;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
 class LdapAuthMiddleware extends AuthMiddleware
diff --git a/services/PrintService.php b/services/PrintService.php
index 6b47ac9d..6cff654d 100644
--- a/services/PrintService.php
+++ b/services/PrintService.php
@@ -3,8 +3,8 @@
 namespace Grocy\Services;
 
 use DateTime;
-use Mike42\Escpos\PrintConnectors\NetworkPrintConnector;
 use Mike42\Escpos\PrintConnectors\FilePrintConnector;
+use Mike42\Escpos\PrintConnectors\NetworkPrintConnector;
 use Mike42\Escpos\Printer;
 
 class PrintService extends BaseService