diff --git a/lib/BackgroundJobs/BackupJob.php b/lib/BackgroundJobs/BackupJob.php
index d7030d6f..95d03a14 100644
--- a/lib/BackgroundJobs/BackupJob.php
+++ b/lib/BackgroundJobs/BackupJob.php
@@ -7,10 +7,10 @@
 
 namespace OCA\Bookmarks\BackgroundJobs;
 
+use OCA\Bookmarks\Db\BookmarkMapper;
 use OCA\Bookmarks\Service\BackupManager;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\TimedJob;
-use OCA\Bookmarks\Db\BookmarkMapper;
 use OCP\IConfig;
 use OCP\IUserManager;
 use OCP\IUserSession;
diff --git a/lib/BackgroundJobs/CrawlJob.php b/lib/BackgroundJobs/CrawlJob.php
index 1fa782f4..69a88a77 100644
--- a/lib/BackgroundJobs/CrawlJob.php
+++ b/lib/BackgroundJobs/CrawlJob.php
@@ -7,12 +7,12 @@
 
 namespace OCA\Bookmarks\BackgroundJobs;
 
-use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\BackgroundJob\TimedJob;
 use OCA\Bookmarks\Db\Bookmark;
 use OCA\Bookmarks\Db\BookmarkMapper;
 use OCA\Bookmarks\Service\BookmarkPreviewer;
 use OCA\Bookmarks\Service\CrawlService;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\TimedJob;
 use OCP\IConfig;
 
 class CrawlJob extends TimedJob {
diff --git a/lib/BackgroundJobs/FileCacheGCJob.php b/lib/BackgroundJobs/FileCacheGCJob.php
index d4d8f724..3daa988d 100644
--- a/lib/BackgroundJobs/FileCacheGCJob.php
+++ b/lib/BackgroundJobs/FileCacheGCJob.php
@@ -7,9 +7,9 @@
 
 namespace OCA\Bookmarks\BackgroundJobs;
 
+use OCA\Bookmarks\Service\FileCache;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\TimedJob;
-use OCA\Bookmarks\Service\FileCache;
 use OCP\Files\NotPermittedException;
 use Psr\Log\LoggerInterface;
 
diff --git a/lib/BackgroundJobs/IndividualCrawlJob.php b/lib/BackgroundJobs/IndividualCrawlJob.php
index b0b0e5e6..ff7f8aaf 100644
--- a/lib/BackgroundJobs/IndividualCrawlJob.php
+++ b/lib/BackgroundJobs/IndividualCrawlJob.php
@@ -7,14 +7,14 @@
 
 namespace OCA\Bookmarks\BackgroundJobs;
 
+use OCA\Bookmarks\Db\Bookmark;
+use OCA\Bookmarks\Db\BookmarkMapper;
+use OCA\Bookmarks\Service\CrawlService;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
 use OCP\BackgroundJob\Job;
-use OCA\Bookmarks\Db\Bookmark;
-use OCA\Bookmarks\Db\BookmarkMapper;
-use OCA\Bookmarks\Service\CrawlService;
 use OCP\IConfig;
 
 class IndividualCrawlJob extends Job {
diff --git a/lib/Controller/BookmarkController.php b/lib/Controller/BookmarkController.php
index c91dd1fe..40c0a686 100644
--- a/lib/Controller/BookmarkController.php
+++ b/lib/Controller/BookmarkController.php
@@ -45,8 +45,8 @@ use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Files\IRootFolder;
 use OCP\IL10N;
-use Psr\Log\LoggerInterface;
 use OCP\IURLGenerator;
+use Psr\Log\LoggerInterface;
 
 class BookmarkController extends ApiController {
 	private const IMAGES_CACHE_TTL = 7 * 24 * 60 * 60;
diff --git a/lib/Flow/CreateBookmark.php b/lib/Flow/CreateBookmark.php
index 4c7cbcb0..47a304d6 100644
--- a/lib/Flow/CreateBookmark.php
+++ b/lib/Flow/CreateBookmark.php
@@ -22,16 +22,16 @@ use OCP\Files\IRootFolder;
 use OCP\Files\Node;
 use OCP\Files\NotPermittedException;
 use OCP\IL10N;
-use OCP\Lock\LockedException;
-use Psr\Log\LoggerInterface;
 use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserSession;
+use OCP\Lock\LockedException;
 use OCP\Util;
 use OCP\WorkflowEngine\EntityContext\IUrl;
 use OCP\WorkflowEngine\IManager;
 use OCP\WorkflowEngine\IOperation;
 use OCP\WorkflowEngine\IRuleMatcher;
+use Psr\Log\LoggerInterface;
 
 class CreateBookmark implements IOperation {
 	private const REGEX_URL = "%(https?|ftp)://(\S+(:\S*)?@|\d{1,3}(\.\d{1,3}){3}|(([a-z\d\x{00a1}-\x{ffff}]+-?)*[a-z\d\x{00a1}-\x{ffff}]+)(\.([a-z\d\x{00a1}-\x{ffff}]+-?)*[a-z\d\x{00a1}-\x{ffff}]+)*(\.[a-z\x{00a1}-\x{ffff}]{2,6}))(:\d+)?([^\s]*)?%ium";
diff --git a/lib/Middleware/ExceptionMiddleware.php b/lib/Middleware/ExceptionMiddleware.php
index f49bfccf..b1de343e 100644
--- a/lib/Middleware/ExceptionMiddleware.php
+++ b/lib/Middleware/ExceptionMiddleware.php
@@ -7,6 +7,7 @@
 
 namespace OCA\Bookmarks\Middleware;
 
+use \OCP\AppFramework\Middleware;
 use OCA\Bookmarks\Controller\BookmarkController;
 use OCA\Bookmarks\Controller\FoldersController;
 use OCA\Bookmarks\Controller\InternalBookmarkController;
@@ -14,7 +15,6 @@ use OCA\Bookmarks\Controller\InternalFoldersController;
 use OCA\Bookmarks\Exception\UnauthenticatedError;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
-use \OCP\AppFramework\Middleware;
 
 class ExceptionMiddleware extends Middleware {
 	public function afterException($controller, $methodName, \Exception $exception): DataResponse {
diff --git a/lib/Service/BackupManager.php b/lib/Service/BackupManager.php
index 5dc96ffe..f721580a 100644
--- a/lib/Service/BackupManager.php
+++ b/lib/Service/BackupManager.php
@@ -9,9 +9,9 @@ namespace OCA\Bookmarks\Service;
 
 use DateTime;
 use DateTimeImmutable;
-use OCP\Files\Folder;
 use OCA\Bookmarks\Db\FolderMapper;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
 use OCP\IConfig;
 use OCP\IL10N;
diff --git a/lib/Service/CrawlService.php b/lib/Service/CrawlService.php
index d09bfc57..626ef3e1 100644
--- a/lib/Service/CrawlService.php
+++ b/lib/Service/CrawlService.php
@@ -7,9 +7,9 @@
 
 namespace OCA\Bookmarks\Service;
 
+use Exception;
 use fivefilters\Readability\Configuration;
 use fivefilters\Readability\Readability;
-use Exception;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response;
 use Mimey\MimeTypes;
diff --git a/lib/Service/Previewers/PageresBookmarkPreviewer.php b/lib/Service/Previewers/PageresBookmarkPreviewer.php
index d543b3f5..bd38bd11 100644
--- a/lib/Service/Previewers/PageresBookmarkPreviewer.php
+++ b/lib/Service/Previewers/PageresBookmarkPreviewer.php
@@ -13,8 +13,8 @@ use OCA\Bookmarks\Contract\IImage;
 use OCA\Bookmarks\Db\Bookmark;
 use OCA\Bookmarks\Image;
 use OCP\IConfig;
-use Psr\Log\LoggerInterface;
 use OCP\ITempManager;
+use Psr\Log\LoggerInterface;
 
 class PageresBookmarkPreviewer implements IBookmarkPreviewer {
 	public const CACHE_PREFIX = 'bookmarks.WebshotPreviewService';
diff --git a/lib/Service/TreeCacheManager.php b/lib/Service/TreeCacheManager.php
index fe609026..4588ad1e 100644
--- a/lib/Service/TreeCacheManager.php
+++ b/lib/Service/TreeCacheManager.php
@@ -8,11 +8,11 @@
 namespace OCA\Bookmarks\Service;
 
 use OCA\Bookmarks\Db\BookmarkMapper;
+use OCA\Bookmarks\Db\Folder;
 use OCA\Bookmarks\Db\FolderMapper;
 use OCA\Bookmarks\Db\SharedFolderMapper;
 use OCA\Bookmarks\Db\ShareMapper;
 use OCA\Bookmarks\Db\TreeMapper;
-use OCA\Bookmarks\Db\Folder;
 use OCA\Bookmarks\Events\ChangeEvent;
 use OCA\Bookmarks\Events\MoveEvent;
 use OCA\Bookmarks\Exception\UnsupportedOperation;
diff --git a/tests/BackgroundJobTest.php b/tests/BackgroundJobTest.php
index ba129832..5916ea36 100644
--- a/tests/BackgroundJobTest.php
+++ b/tests/BackgroundJobTest.php
@@ -2,8 +2,8 @@
 
 namespace OCA\Bookmarks\Tests;
 
-use OCA\Bookmarks\BackgroundJobs\CrawlJob;
 use OC\BackgroundJob\JobList;
+use OCA\Bookmarks\BackgroundJobs\CrawlJob;
 use OCA\Bookmarks\BackgroundJobs\FileCacheGCJob;
 use OCA\Bookmarks\Db\Bookmark;
 use OCA\Bookmarks\Db\BookmarkMapper;