diff --git a/lib/Command/SendAllMail.php b/lib/Command/SendAllMail.php
index 891d75d..88dec0a 100644
--- a/lib/Command/SendAllMail.php
+++ b/lib/Command/SendAllMail.php
@@ -24,10 +24,10 @@
 
 namespace OCA\MonthlyStatusEmail\Command;
 
-use OCP\IUserManager;
 use OC\Core\Command\Base;
 use OCA\MonthlyStatusEmail\Service\MailSender;
 use OCA\MonthlyStatusEmail\Service\NotificationTrackerService;
+use OCP\IUserManager;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
diff --git a/lib/Command/SendMail.php b/lib/Command/SendMail.php
index f1242d1..bed414a 100644
--- a/lib/Command/SendMail.php
+++ b/lib/Command/SendMail.php
@@ -24,10 +24,10 @@
 
 namespace OCA\MonthlyStatusEmail\Command;
 
-use OCP\IUserManager;
 use OC\Core\Command\Base;
 use OCA\MonthlyStatusEmail\Service\MailSender;
 use OCA\MonthlyStatusEmail\Service\NotificationTrackerService;
+use OCP\IUserManager;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/lib/Controller/OptoutController.php b/lib/Controller/OptoutController.php
index 7e232a1..e271cfd 100644
--- a/lib/Controller/OptoutController.php
+++ b/lib/Controller/OptoutController.php
@@ -27,12 +27,12 @@
 use OCA\MonthlyStatusEmail\Service\MailSender;
 use OCA\MonthlyStatusEmail\Service\NotFoundException;
 use OCA\MonthlyStatusEmail\Service\NotificationTrackerService;
+use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\Template\PublicTemplateResponse;
 use OCP\IRequest;
-use OCP\AppFramework\Controller;
 use OCP\IUserSession;
 
 /**
diff --git a/lib/Jobs/InitDatabaseJob.php b/lib/Jobs/InitDatabaseJob.php
index a77c344..d382598 100644
--- a/lib/Jobs/InitDatabaseJob.php
+++ b/lib/Jobs/InitDatabaseJob.php
@@ -27,8 +27,8 @@
 namespace OCA\MonthlyStatusEmail\Jobs;
 
 use OCA\MonthlyStatusEmail\Service\NotificationTrackerService;
-use OCP\BackgroundJob\QueuedJob;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\QueuedJob;
 use OCP\IUser;
 use OCP\IUserManager;
 
diff --git a/lib/Listener/FirstLoginListener.php b/lib/Listener/FirstLoginListener.php
index ad1c583..e218a2d 100644
--- a/lib/Listener/FirstLoginListener.php
+++ b/lib/Listener/FirstLoginListener.php
@@ -29,9 +29,9 @@
 use OCA\MonthlyStatusEmail\Service\MessageProvider;
 use OCA\MonthlyStatusEmail\Service\NotFoundException;
 use OCA\MonthlyStatusEmail\Service\NotificationTrackerService;
+use OCP\IConfig;
 use OCP\IServerContainer;
 use OCP\IUser;
-use OCP\IConfig;
 use OCP\Mail\IMailer;
 
 // TODO port to IListener
diff --git a/lib/Migration/Version23000Date2021090112000001.php b/lib/Migration/Version23000Date2021090112000001.php
index 3d26c42..b23fa2a 100644
--- a/lib/Migration/Version23000Date2021090112000001.php
+++ b/lib/Migration/Version23000Date2021090112000001.php
@@ -28,8 +28,8 @@
 
 use Closure;
 use OCP\DB\ISchemaWrapper;
-use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
 
 class Version23000Date2021090112000001 extends SimpleMigrationStep {
 	/**
diff --git a/lib/Migration/Version23000Date2022022912000001.php b/lib/Migration/Version23000Date2022022912000001.php
index 478c696..3f8cf34 100644
--- a/lib/Migration/Version23000Date2022022912000001.php
+++ b/lib/Migration/Version23000Date2022022912000001.php
@@ -28,10 +28,10 @@
 
 use Closure;
 use OCP\DB\ISchemaWrapper;
-use OCP\Migration\SimpleMigrationStep;
-use OCP\Migration\IOutput;
-use OCP\IDBConnection;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
 
 class Version23000Date2022022912000001 extends SimpleMigrationStep {
 
diff --git a/lib/Service/MailSender.php b/lib/Service/MailSender.php
index 1dd642d..3f69e87 100644
--- a/lib/Service/MailSender.php
+++ b/lib/Service/MailSender.php
@@ -25,9 +25,9 @@
 
 namespace OCA\MonthlyStatusEmail\Service;
 
-use OCP\Files\FileInfo;
 use OCA\MonthlyStatusEmail\Db\NotificationTracker;
 use OCP\DB\Exception;
+use OCP\Files\FileInfo;
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IServerContainer;
diff --git a/lib/Service/StorageInfoProvider.php b/lib/Service/StorageInfoProvider.php
index 843283a..a1ad525 100644
--- a/lib/Service/StorageInfoProvider.php
+++ b/lib/Service/StorageInfoProvider.php
@@ -4,8 +4,8 @@
 namespace OCA\MonthlyStatusEmail\Service;
 
 use OC\Files\Storage\Wrapper\Quota;
-use OCP\IUser;
 use OCP\Files\IRootFolder;
+use OCP\IUser;
 
 class StorageInfoProvider {
 	/**