diff --git a/Admin/Installer.php b/Admin/Installer.php
index b58f2d3..49b12e2 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\News\Admin;
 
-use phpOMS\DataStorage\Database\DatabaseType;
 use phpOMS\DataStorage\Database\DatabasePool;
+use phpOMS\DataStorage\Database\DatabaseType;
 use phpOMS\Module\InfoManager;
 use phpOMS\Module\InstallerAbstract;
 
diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index f8d0591..ed33797 100644
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -1,9 +1,9 @@
 <?php
 
-use phpOMS\Router\RouteVerb;
-use phpOMS\Account\PermissionType;
-use Modules\News\Models\PermissionState;
 use Modules\News\Controller\ApiController;
+use Modules\News\Models\PermissionState;
+use phpOMS\Account\PermissionType;
+use phpOMS\Router\RouteVerb;
 
 return [
     '^.*/api/news.*$' => [
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index fa4c2cb..b16ee8a 100644
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -1,9 +1,9 @@
 <?php
 
-use phpOMS\Router\RouteVerb;
-use phpOMS\Account\PermissionType;
-use Modules\News\Models\PermissionState;
 use Modules\News\Controller\BackendController;
+use Modules\News\Models\PermissionState;
+use phpOMS\Account\PermissionType;
+use phpOMS\Router\RouteVerb;
 
 return [
     '^.*/backend/news/dashboard.*$' => [
diff --git a/Admin/Status.php b/Admin/Status.php
index e454451..f5859f5 100644
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\News\Admin;
 
-use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\StatusAbstract;
-use phpOMS\Module\InfoManager;
 
 /**
  * Navigation class.
diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php
index b453d5b..38bde78 100644
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -16,8 +16,8 @@ namespace Modules\News\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\DataStorage\Database\Schema\Builder;
-use phpOMS\Module\UninstallerAbstract;
 use phpOMS\Module\InfoManager;
+use phpOMS\Module\UninstallerAbstract;
 
 /**
  * Navigation class.
diff --git a/Admin/Updater.php b/Admin/Updater.php
index 853783e..a900aef 100644
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -14,10 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\News\Admin;
 
-use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\UpdaterAbstract;
-use phpOMS\System\File\Local\Directory;
-use phpOMS\Module\InfoManager;
 
 /**
  * Updater class.
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 3b30fe0..f0be400 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -14,27 +14,21 @@ declare(strict_types=1);
 
 namespace Modules\News\Controller;
 
-use phpOMS\Model\Message\FormValidation;
-
 use Modules\News\Models\Badge;
+
 use Modules\News\Models\BadgeMapper;
 use Modules\News\Models\NewsArticle;
 use Modules\News\Models\NewsArticleMapper;
 use Modules\News\Models\NewsStatus;
 use Modules\News\Models\NewsType;
-use Modules\News\Models\PermissionState;
-
 use phpOMS\Account\Account;
-use phpOMS\Account\PermissionType;
+
 use phpOMS\Localization\ISO639x1Enum;
-use phpOMS\Message\Http\RequestStatusCode;
+use phpOMS\Message\NotificationLevel;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\Message\NotificationLevel;
-use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
+use phpOMS\Model\Message\FormValidation;
 use phpOMS\Utils\Parser\Markdown\Markdown;
-use phpOMS\Views\View;
 
 /**
  * News controller class.
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 64efccb..6b32698 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,25 +14,14 @@ declare(strict_types=1);
 
 namespace Modules\News\Controller;
 
-use phpOMS\Model\Message\FormValidation;
 
-use Modules\News\Models\BadgeMapper;
-use Modules\News\Models\NewsArticle;
 use Modules\News\Models\NewsArticleMapper;
-use Modules\News\Models\NewsStatus;
-use Modules\News\Models\NewsType;
 use Modules\News\Models\PermissionState;
 
-use phpOMS\Account\Account;
 use phpOMS\Account\PermissionType;
-use phpOMS\Localization\ISO639x1Enum;
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\Message\NotificationLevel;
-use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
-use phpOMS\Utils\Parser\Markdown\Markdown;
 use phpOMS\Views\View;
 
 /**
diff --git a/Models/BadgeMapper.php b/Models/BadgeMapper.php
index 0f95aab..fb84e3f 100644
--- a/Models/BadgeMapper.php
+++ b/Models/BadgeMapper.php
@@ -14,11 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\News\Models;
 
-use Modules\Admin\Models\AccountMapper;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 
 final class BadgeMapper extends DataMapperAbstract
 {
diff --git a/Models/NewsArticle.php b/Models/NewsArticle.php
index fa6d36b..e620b31 100644
--- a/Models/NewsArticle.php
+++ b/Models/NewsArticle.php
@@ -15,8 +15,8 @@ declare(strict_types=1);
 namespace Modules\News\Models;
 
 use phpOMS\Contract\ArrayableInterface;
-use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
 use phpOMS\Localization\ISO639x1Enum;
+use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
 
 /**
  * News article class.
diff --git a/Models/NewsArticleMapper.php b/Models/NewsArticleMapper.php
index 2becf5d..5ce2611 100644
--- a/Models/NewsArticleMapper.php
+++ b/Models/NewsArticleMapper.php
@@ -16,9 +16,6 @@ namespace Modules\News\Models;
 
 use Modules\Admin\Models\AccountMapper;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 
 final class NewsArticleMapper extends DataMapperAbstract
 {