diff --git a/Models/Department.php b/Models/Department.php
index f4c3285..111505c 100755
--- a/Models/Department.php
+++ b/Models/Department.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 namespace Modules\RiskManagement\Models;
 
 use Modules\Organization\Models\Department as OrgDepartment;
-use Modules\Organization\Models\NullDepartment as NullOrgDepartment;
 
 /**
  * Risk Management class.
diff --git a/Models/RiskMapper.php b/Models/RiskMapper.php
index 39a82e8..e3dcf10 100755
--- a/Models/RiskMapper.php
+++ b/Models/RiskMapper.php
@@ -15,8 +15,8 @@ declare(strict_types=1);
 namespace Modules\RiskManagement\Models;
 
 use Modules\Media\Models\MediaMapper;
-use Modules\Organization\Models\UnitMapper;
 use Modules\Organization\Models\DepartmentMapper;
+use Modules\Organization\Models\UnitMapper;
 use phpOMS\DataStorage\Database\DataMapperAbstract;
 
 /**
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index 6663e53..e2f7a2c 100644
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -12,85 +12,85 @@
 declare(strict_types=1);
 
 return ['RiskManagement' => [
-    'Active' => '',
-    'All' => '',
-    'Assessment' => '',
-    'AvgRiskAmount' => '',
-    'Basic' => '',
-    'Categories' => '',
-    'Category' => '',
-    'Cause' => '',
-    'Causes' => '',
-    'Cost' => '',
-    'Critical' => '',
-    'Damage' => '',
-    'Department' => '',
-    'Departments' => '',
-    'Description' => '',
-    'Due' => '',
-    'Evaluation' => '',
-    'Export' => '',
-    'Frequency' => '',
-    'Front' => '',
-    'History' => '',
-    'Interval' => '',
-    'Language' => '',
-    'LastReevaluation' => '',
-    'Level' => '',
-    'Limit' => '',
-    'MainCategory' => '',
-    'MainCause' => '',
-    'MainDepartment' => '',
-    'Manager' => '',
-    'Media' => '',
-    'Name' => '',
-    'Navigation' => '',
-    'New' => '',
-    'NewRisk' => '',
-    'NextReevaluation' => '',
-    'Outdated' => '',
-    'OverallRisk' => '',
-    'Parent' => '',
-    'Probability' => '',
-    'Process' => '',
-    'Processes' => '',
-    'Project' => '',
-    'Projects' => '',
-    'Protection' => '',
-    'Ratio' => '',
-    'Reduction' => '',
-    'RemainingRisk' => '',
-    'Responsibility' => '',
-    'Responsible' => '',
-    'Review' => '',
-    'Risk' => '',
-    'RiskAcceptance' => '',
-    'RiskConsequence' => '',
-    'RiskIndex' => '',
-    'RiskLevels' => '',
-    'RiskLikelihood' => '',
-    'RiskObject' => '',
-    'RiskObjects' => '',
-    'RiskObjectStatus' => '',
+    'Active'            => '',
+    'All'               => '',
+    'Assessment'        => '',
+    'AvgRiskAmount'     => '',
+    'Basic'             => '',
+    'Categories'        => '',
+    'Category'          => '',
+    'Cause'             => '',
+    'Causes'            => '',
+    'Cost'              => '',
+    'Critical'          => '',
+    'Damage'            => '',
+    'Department'        => '',
+    'Departments'       => '',
+    'Description'       => '',
+    'Due'               => '',
+    'Evaluation'        => '',
+    'Export'            => '',
+    'Frequency'         => '',
+    'Front'             => '',
+    'History'           => '',
+    'Interval'          => '',
+    'Language'          => '',
+    'LastReevaluation'  => '',
+    'Level'             => '',
+    'Limit'             => '',
+    'MainCategory'      => '',
+    'MainCause'         => '',
+    'MainDepartment'    => '',
+    'Manager'           => '',
+    'Media'             => '',
+    'Name'              => '',
+    'Navigation'        => '',
+    'New'               => '',
+    'NewRisk'           => '',
+    'NextReevaluation'  => '',
+    'Outdated'          => '',
+    'OverallRisk'       => '',
+    'Parent'            => '',
+    'Probability'       => '',
+    'Process'           => '',
+    'Processes'         => '',
+    'Project'           => '',
+    'Projects'          => '',
+    'Protection'        => '',
+    'Ratio'             => '',
+    'Reduction'         => '',
+    'RemainingRisk'     => '',
+    'Responsibility'    => '',
+    'Responsible'       => '',
+    'Review'            => '',
+    'Risk'              => '',
+    'RiskAcceptance'    => '',
+    'RiskConsequence'   => '',
+    'RiskIndex'         => '',
+    'RiskLevels'        => '',
+    'RiskLikelihood'    => '',
+    'RiskObject'        => '',
+    'RiskObjects'       => '',
+    'RiskObjectStatus'  => '',
     'RiskProbabilities' => '',
-    'RiskProtection' => '',
-    'Risks' => '',
-    'RiskStatus' => '',
-    'Select' => '',
-    'Severity' => '',
-    'Solution' => '',
-    'Solutions' => '',
-    'Statistics' => '',
-    'Status' => '',
-    'Theme' => '',
-    'Title' => '',
-    'TopRisks' => '',
-    'Total' => '',
-    'Type' => '',
-    'Unit' => '',
-    'Units' => '',
-    'Upload' => '',
-    'UserGroup' => '',
-    'Value' => '',
-    'Watchlist' => '',
+    'RiskProtection'    => '',
+    'Risks'             => '',
+    'RiskStatus'        => '',
+    'Select'            => '',
+    'Severity'          => '',
+    'Solution'          => '',
+    'Solutions'         => '',
+    'Statistics'        => '',
+    'Status'            => '',
+    'Theme'             => '',
+    'Title'             => '',
+    'TopRisks'          => '',
+    'Total'             => '',
+    'Type'              => '',
+    'Unit'              => '',
+    'Units'             => '',
+    'Upload'            => '',
+    'UserGroup'         => '',
+    'Value'             => '',
+    'Watchlist'         => '',
 ]];
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 170d4ef..569e8cc 100644
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -12,85 +12,85 @@
 declare(strict_types=1);
 
 return ['RiskManagement' => [
-    'Active' => 'Active',
-    'All' => 'All',
-    'Assessment' => 'Assessment',
-    'AvgRiskAmount' => 'Avg. Risk Amount',
-    'Basic' => 'Basic',
-    'Categories' => 'Categories',
-    'Category' => 'Category',
-    'Cause' => 'Cause',
-    'Causes' => 'Causes',
-    'Cost' => 'Cost',
-    'Critical' => 'Critical',
-    'Damage' => 'Damage',
-    'Department' => 'Department',
-    'Departments' => 'Departments',
-    'Description' => 'Description',
-    'Due' => 'Due',
-    'Evaluation' => 'Evaluation',
-    'Export' => 'Export',
-    'Frequency' => 'Frequency',
-    'Front' => 'Front',
-    'History' => 'History',
-    'Interval' => 'Interval',
-    'Language' => 'Language',
-    'LastReevaluation' => 'Last Reevaluation',
-    'Level' => 'Level',
-    'Limit' => 'Limit',
-    'MainCategory' => 'Main Category',
-    'MainCause' => 'Main Cause',
-    'MainDepartment' => 'Main Department',
-    'Manager' => 'Manager',
-    'Media' => 'Media',
-    'Name' => 'Name',
-    'Navigation' => 'Navigation',
-    'New' => 'New',
-    'NewRisk' => 'New Risk',
-    'NextReevaluation' => 'Next Reevaluation',
-    'Outdated' => 'Outdated',
-    'OverallRisk' => 'Overall Risk',
-    'Parent' => 'Parent',
-    'Probability' => 'Probability',
-    'Process' => 'Process',
-    'Processes' => 'Processes',
-    'Project' => 'Project',
-    'Projects' => 'Projects',
-    'Protection' => 'Protection',
-    'Ratio' => 'Ratio',
-    'Reduction' => 'Reduction',
-    'RemainingRisk' => 'Remaining Risk',
-    'Responsibility' => 'Responsibility',
-    'Responsible' => 'Responsible',
-    'Review' => 'Review',
-    'Risk' => 'Risk',
-    'RiskAcceptance' => 'Risk Acceptance',
-    'RiskConsequence' => 'Risk Consequence',
-    'RiskIndex' => 'Risk Index',
-    'RiskLevels' => 'Risk Levels',
-    'RiskLikelihood' => 'Risk Likelihood',
-    'RiskObject' => 'Risk Object',
-    'RiskObjects' => 'Risk Objects',
-    'RiskObjectStatus' => 'Risk Object Status',
+    'Active'            => 'Active',
+    'All'               => 'All',
+    'Assessment'        => 'Assessment',
+    'AvgRiskAmount'     => 'Avg. Risk Amount',
+    'Basic'             => 'Basic',
+    'Categories'        => 'Categories',
+    'Category'          => 'Category',
+    'Cause'             => 'Cause',
+    'Causes'            => 'Causes',
+    'Cost'              => 'Cost',
+    'Critical'          => 'Critical',
+    'Damage'            => 'Damage',
+    'Department'        => 'Department',
+    'Departments'       => 'Departments',
+    'Description'       => 'Description',
+    'Due'               => 'Due',
+    'Evaluation'        => 'Evaluation',
+    'Export'            => 'Export',
+    'Frequency'         => 'Frequency',
+    'Front'             => 'Front',
+    'History'           => 'History',
+    'Interval'          => 'Interval',
+    'Language'          => 'Language',
+    'LastReevaluation'  => 'Last Reevaluation',
+    'Level'             => 'Level',
+    'Limit'             => 'Limit',
+    'MainCategory'      => 'Main Category',
+    'MainCause'         => 'Main Cause',
+    'MainDepartment'    => 'Main Department',
+    'Manager'           => 'Manager',
+    'Media'             => 'Media',
+    'Name'              => 'Name',
+    'Navigation'        => 'Navigation',
+    'New'               => 'New',
+    'NewRisk'           => 'New Risk',
+    'NextReevaluation'  => 'Next Reevaluation',
+    'Outdated'          => 'Outdated',
+    'OverallRisk'       => 'Overall Risk',
+    'Parent'            => 'Parent',
+    'Probability'       => 'Probability',
+    'Process'           => 'Process',
+    'Processes'         => 'Processes',
+    'Project'           => 'Project',
+    'Projects'          => 'Projects',
+    'Protection'        => 'Protection',
+    'Ratio'             => 'Ratio',
+    'Reduction'         => 'Reduction',
+    'RemainingRisk'     => 'Remaining Risk',
+    'Responsibility'    => 'Responsibility',
+    'Responsible'       => 'Responsible',
+    'Review'            => 'Review',
+    'Risk'              => 'Risk',
+    'RiskAcceptance'    => 'Risk Acceptance',
+    'RiskConsequence'   => 'Risk Consequence',
+    'RiskIndex'         => 'Risk Index',
+    'RiskLevels'        => 'Risk Levels',
+    'RiskLikelihood'    => 'Risk Likelihood',
+    'RiskObject'        => 'Risk Object',
+    'RiskObjects'       => 'Risk Objects',
+    'RiskObjectStatus'  => 'Risk Object Status',
     'RiskProbabilities' => 'Risk Probabilities',
-    'RiskProtection' => 'Risk Protection',
-    'Risks' => 'Risks',
-    'RiskStatus' => 'Risk Status',
-    'Select' => 'Select',
-    'Severity' => 'Severity',
-    'Solution' => 'Solution',
-    'Solutions' => 'Solutions',
-    'Statistics' => 'Statistics',
-    'Status' => 'Status',
-    'Theme' => 'Theme',
-    'Title' => 'Title',
-    'TopRisks' => 'Top Risks',
-    'Total' => 'Total',
-    'Type' => 'Type',
-    'Unit' => 'Unit',
-    'Units' => 'Units',
-    'Upload' => 'Upload',
-    'UserGroup' => 'User/Group',
-    'Value' => 'Value',
-    'Watchlist' => 'Watchlist',
+    'RiskProtection'    => 'Risk Protection',
+    'Risks'             => 'Risks',
+    'RiskStatus'        => 'Risk Status',
+    'Select'            => 'Select',
+    'Severity'          => 'Severity',
+    'Solution'          => 'Solution',
+    'Solutions'         => 'Solutions',
+    'Statistics'        => 'Statistics',
+    'Status'            => 'Status',
+    'Theme'             => 'Theme',
+    'Title'             => 'Title',
+    'TopRisks'          => 'Top Risks',
+    'Total'             => 'Total',
+    'Type'              => 'Type',
+    'Unit'              => 'Unit',
+    'Units'             => 'Units',
+    'Upload'            => 'Upload',
+    'UserGroup'         => 'User/Group',
+    'Value'             => 'Value',
+    'Watchlist'         => 'Watchlist',
 ]];
diff --git a/tests/Models/CauseMapperTest.php b/tests/Models/CauseMapperTest.php
index 66a17a0..9f5504e 100755
--- a/tests/Models/CauseMapperTest.php
+++ b/tests/Models/CauseMapperTest.php
@@ -14,15 +14,13 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\tests\Models;
 
+use Modules\Organization\Models\NullDepartment as NullOrgDepartment;
+use Modules\Organization\Models\NullUnit;
 use Modules\RiskManagement\Models\Category;
 use Modules\RiskManagement\Models\Cause;
 use Modules\RiskManagement\Models\CauseMapper;
 use Modules\RiskManagement\Models\Department;
-use Modules\RiskManagement\Models\NullDepartment;
-use Modules\Organization\Models\Department as OrgDepartment;
-use Modules\Organization\Models\NullDepartment as NullOrgDepartment;
 use Modules\RiskManagement\Models\Risk;
-use Modules\Organization\Models\NullUnit;
 
 /**
  * @internal
@@ -40,7 +38,7 @@ class CauseMapperTest extends \PHPUnit\Framework\TestCase
         $obj->descriptionRaw = 'Description';
         $obj->setProbability(1);
 
-        $department = new Department();
+        $department             = new Department();
         $department->department = new NullOrgDepartment(2);
         $obj->setDepartment($department);
 
diff --git a/tests/Models/CauseTest.php b/tests/Models/CauseTest.php
index ceb5318..4a43151 100755
--- a/tests/Models/CauseTest.php
+++ b/tests/Models/CauseTest.php
@@ -16,8 +16,8 @@ namespace Modules\RiskManagement\tests\Models;
 
 use Modules\RiskManagement\Models\Cause;
 use Modules\RiskManagement\Models\NullCategory;
-use Modules\RiskManagement\Models\NullRisk;
 use Modules\RiskManagement\Models\NullDepartment;
+use Modules\RiskManagement\Models\NullRisk;
 
 /**
  * @internal
diff --git a/tests/Models/DepartmentMapperTest.php b/tests/Models/DepartmentMapperTest.php
index d994a68..0fef0d8 100755
--- a/tests/Models/DepartmentMapperTest.php
+++ b/tests/Models/DepartmentMapperTest.php
@@ -29,7 +29,7 @@ class DepartmentMapperTest extends \PHPUnit\Framework\TestCase
      */
     public function testCRUD() : void
     {
-        $obj = new Department();
+        $obj             = new Department();
         $obj->department = new NullDepartment();
         $obj->setResponsible(1);
         $obj->setDeputy(1);
diff --git a/tests/Models/DepartmentTest.php b/tests/Models/DepartmentTest.php
index cc25bf5..7632bac 100755
--- a/tests/Models/DepartmentTest.php
+++ b/tests/Models/DepartmentTest.php
@@ -14,9 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\tests\Models;
 
-use Modules\RiskManagement\Models\Department;
-use Modules\Organization\Models\Department as OrgDepartment;
 use Modules\Organization\Models\NullDepartment as NullOrgDepartment;
+use Modules\RiskManagement\Models\Department;
 
 /**
  * @internal
@@ -32,7 +31,7 @@ class DepartmentTest extends \PHPUnit\Framework\TestCase
         $obj = new Department();
 
         self::assertEquals(0, $obj->getId());
-        self::assertEquals(null, $obj->department);
+        self::assertNull($obj->department);
         self::assertNull($obj->getResponsible());
         self::assertNull($obj->getDeputy());
     }
diff --git a/tests/Models/ProcessMapperTest.php b/tests/Models/ProcessMapperTest.php
index 4ce0c06..796b38b 100755
--- a/tests/Models/ProcessMapperTest.php
+++ b/tests/Models/ProcessMapperTest.php
@@ -15,9 +15,9 @@ declare(strict_types=1);
 namespace Modules\RiskManagement\tests\Models;
 
 use Modules\Organization\Models\NullUnit;
+use Modules\RiskManagement\Models\NullDepartment;
 use Modules\RiskManagement\Models\Process;
 use Modules\RiskManagement\Models\ProcessMapper;
-use Modules\RiskManagement\Models\NullDepartment;
 
 /**
  * @internal
diff --git a/tests/Models/ProcessTest.php b/tests/Models/ProcessTest.php
index d2cc1a6..78bde6c 100755
--- a/tests/Models/ProcessTest.php
+++ b/tests/Models/ProcessTest.php
@@ -14,9 +14,9 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\tests\Models;
 
-use Modules\RiskManagement\Models\Process;
 use Modules\Organization\Models\NullUnit;
 use Modules\RiskManagement\Models\NullDepartment;
+use Modules\RiskManagement\Models\Process;
 
 /**
  * @internal
@@ -36,7 +36,7 @@ class ProcessTest extends \PHPUnit\Framework\TestCase
         self::assertEquals('', $obj->description);
         self::assertEquals('', $obj->descriptionRaw);
         self::assertNull($obj->getDepartment());
-        self::assertEquals(null, $obj->getUnit());
+        self::assertNull($obj->getUnit());
         self::assertNull($obj->getResponsible());
         self::assertNull($obj->getDeputy());
     }
diff --git a/tests/Models/ProjectMapperTest.php b/tests/Models/ProjectMapperTest.php
index 2ef1262..c15606d 100755
--- a/tests/Models/ProjectMapperTest.php
+++ b/tests/Models/ProjectMapperTest.php
@@ -14,9 +14,9 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\tests\Models;
 
+use Modules\ProjectManagement\Models\NullProject;
 use Modules\RiskManagement\Models\Project;
 use Modules\RiskManagement\Models\ProjectMapper;
-use Modules\ProjectManagement\Models\NullProject;
 
 /**
  * @internal
diff --git a/tests/Models/ProjectTest.php b/tests/Models/ProjectTest.php
index e758892..5fc5ac0 100755
--- a/tests/Models/ProjectTest.php
+++ b/tests/Models/ProjectTest.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\tests\Models;
 
-use Modules\RiskManagement\Models\Project;
 use Modules\ProjectManagement\Models\NullProject;
+use Modules\RiskManagement\Models\Project;
 
 /**
  * @internal
@@ -31,7 +31,7 @@ class ProjectTest extends \PHPUnit\Framework\TestCase
         $obj = new Project();
 
         self::assertEquals(0, $obj->getId());
-        self::assertEquals(null, $obj->getProject());
+        self::assertNull($obj->getProject());
         self::assertNull($obj->getResponsible());
         self::assertNull($obj->getDeputy());
     }
diff --git a/tests/Models/RiskMapperTest.php b/tests/Models/RiskMapperTest.php
index 7e8b5ea..ff97ac7 100755
--- a/tests/Models/RiskMapperTest.php
+++ b/tests/Models/RiskMapperTest.php
@@ -16,6 +16,9 @@ namespace Modules\RiskManagement\tests\Models;
 
 use Modules\Admin\Models\NullAccount;
 use Modules\Media\Models\Media;
+use Modules\Organization\Models\NullDepartment;
+use Modules\Organization\Models\NullUnit;
+use Modules\ProjectManagement\Models\NullProject;
 use Modules\RiskManagement\Models\Category;
 use Modules\RiskManagement\Models\Cause;
 use Modules\RiskManagement\Models\Process;
@@ -24,9 +27,6 @@ use Modules\RiskManagement\Models\Risk;
 use Modules\RiskManagement\Models\RiskMapper;
 use Modules\RiskManagement\Models\RiskObject;
 use Modules\RiskManagement\Models\Solution;
-use Modules\Organization\Models\NullUnit;
-use Modules\Organization\Models\NullDepartment;
-use Modules\ProjectManagement\Models\NullProject;
 
 /**
  * @internal
diff --git a/tests/Models/RiskTest.php b/tests/Models/RiskTest.php
index a83e659..2700bc5 100755
--- a/tests/Models/RiskTest.php
+++ b/tests/Models/RiskTest.php
@@ -14,14 +14,14 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\tests\Models;
 
+use Modules\Organization\Models\NullDepartment;
+use Modules\Organization\Models\NullUnit;
 use Modules\RiskManagement\Models\Cause;
 use Modules\RiskManagement\Models\Department;
-use Modules\RiskManagement\Models\Risk;
-use Modules\RiskManagement\Models\Solution;
-use Modules\Organization\Models\NullUnit;
-use Modules\Organization\Models\NullDepartment;
 use Modules\RiskManagement\Models\NullCategory;
 use Modules\RiskManagement\Models\NullProcess;
+use Modules\RiskManagement\Models\Risk;
+use Modules\RiskManagement\Models\Solution;
 
 /**
  * @internal
@@ -40,7 +40,7 @@ class RiskTest extends \PHPUnit\Framework\TestCase
         self::assertEquals('', $obj->name);
         self::assertEquals('', $obj->description);
         self::assertEquals('', $obj->descriptionRaw);
-        self::assertEquals(null, $obj->getUnit());
+        self::assertNull($obj->getUnit());
         self::assertNull($obj->getDepartment());
         self::assertNull($obj->getCategory());
         self::assertNull($obj->getProcess());
@@ -77,7 +77,7 @@ class RiskTest extends \PHPUnit\Framework\TestCase
         $obj->setProcess(new NullProcess(4));
         self::assertEquals(4, $obj->getProcess()->getId());
 
-        $department = new Department();
+        $department             = new Department();
         $department->department = new NullDepartment(1);
         $obj->setDepartment(new NullDepartment(1));
 
diff --git a/tests/Models/SolutionMapperTest.php b/tests/Models/SolutionMapperTest.php
index 3e75718..61ec317 100755
--- a/tests/Models/SolutionMapperTest.php
+++ b/tests/Models/SolutionMapperTest.php
@@ -14,10 +14,10 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\tests\Models;
 
-use Modules\RiskManagement\Models\Solution;
-use Modules\RiskManagement\Models\SolutionMapper;
 use Modules\RiskManagement\Models\NullCause;
 use Modules\RiskManagement\Models\NullRisk;
+use Modules\RiskManagement\Models\Solution;
+use Modules\RiskManagement\Models\SolutionMapper;
 
 /**
  * @internal
diff --git a/tests/Models/SolutionTest.php b/tests/Models/SolutionTest.php
index b928ef1..f117ed4 100755
--- a/tests/Models/SolutionTest.php
+++ b/tests/Models/SolutionTest.php
@@ -14,9 +14,9 @@ declare(strict_types=1);
 
 namespace Modules\RiskManagement\tests\Models;
 
-use Modules\RiskManagement\Models\Solution;
 use Modules\RiskManagement\Models\NullCause;
 use Modules\RiskManagement\Models\NullRisk;
+use Modules\RiskManagement\Models\Solution;
 
 /**
  * @internal