diff --git a/Admin/Installer.php b/Admin/Installer.php
index b6bf6ab..bd66cc7 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\HumanResourceManagement\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/Backend.php b/Admin/Routes/Web/Backend.php
index 17e0cd7..db1d2e2 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\HumanResourceManagement\Models\PermissionState;
 use Modules\HumanResourceManagement\Controller\BackendController;
+use Modules\HumanResourceManagement\Models\PermissionState;
+use phpOMS\Account\PermissionType;
+use phpOMS\Router\RouteVerb;
 
 return [
     '^.*/backend/hr/staff/list.*$' => [
diff --git a/Admin/Status.php b/Admin/Status.php
index 155fdb1..095783d 100644
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\HumanResourceManagement\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 65336e4..4bed2a6 100644
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -16,8 +16,8 @@ namespace Modules\HumanResourceManagement\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 71c0cda..9b48973 100644
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -14,10 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\HumanResourceManagement\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/BackendController.php b/Controller/BackendController.php
index 633cff4..b163a21 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,14 +14,12 @@ declare(strict_types=1);
 
 namespace Modules\HumanResourceManagement\Controller;
 
-use phpOMS\Message\RequestAbstract;
-use phpOMS\Message\ResponseAbstract;
-use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
-use phpOMS\Views\View;
-
 use Modules\HumanResourceManagement\Models\EmployeeMapper;
 use Modules\Organization\Models\DepartmentMapper;
+use phpOMS\Message\RequestAbstract;
+use phpOMS\Message\ResponseAbstract;
+
+use phpOMS\Views\View;
 
 /**
  * Human Resources controller class.
diff --git a/Controller/Controller.php b/Controller/Controller.php
index 532f533..c3d405e 100644
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -14,14 +14,9 @@ declare(strict_types=1);
 
 namespace Modules\HumanResourceManagement\Controller;
 
-use phpOMS\Message\RequestAbstract;
-use phpOMS\Message\ResponseAbstract;
 use phpOMS\Module\ModuleAbstract;
-use phpOMS\Module\WebInterface;
-use phpOMS\Views\View;
 
-use Modules\HumanResourceManagement\Models\EmployeeMapper;
-use Modules\Organization\Models\DepartmentMapper;
+use phpOMS\Module\WebInterface;
 
 /**
  * Human Resources controller class.
diff --git a/Models/EmployeeMapper.php b/Models/EmployeeMapper.php
index f132f92..fd218c8 100644
--- a/Models/EmployeeMapper.php
+++ b/Models/EmployeeMapper.php
@@ -15,9 +15,9 @@ declare(strict_types=1);
 namespace Modules\HumanResourceManagement\Models;
 
 use Modules\Admin\Models\AccountMapper;
-use Modules\Organization\Models\UnitMapper;
 use Modules\Organization\Models\DepartmentMapper;
 use Modules\Organization\Models\PositionMapper;
+use Modules\Organization\Models\UnitMapper;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
 
 final class EmployeeMapper extends DataMapperAbstract