diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php
index 8702767..1c9cd7c 100644
--- a/Controller/ApiAttributeController.php
+++ b/Controller/ApiAttributeController.php
@@ -446,7 +446,6 @@ final class ApiAttributeController extends Controller
     public function apiContractAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         return;
-
         // @todo: I don't think values can be deleted? Only Attributes
         // However, It should be possible to remove UNUSED default values
         // either here or other function?
diff --git a/Controller/ApiContractTypeController.php b/Controller/ApiContractTypeController.php
index da37aeb..b756c2a 100644
--- a/Controller/ApiContractTypeController.php
+++ b/Controller/ApiContractTypeController.php
@@ -202,8 +202,8 @@ final class ApiContractTypeController extends Controller
     /**
      * Method to update ContractType from request.
      *
-     * @param RequestAbstract  $request Request
-     * @param BaseStringL11nType     $new     Model to modify
+     * @param RequestAbstract    $request Request
+     * @param BaseStringL11nType $new     Model to modify
      *
      * @return BaseStringL11nType
      *
@@ -319,8 +319,8 @@ final class ApiContractTypeController extends Controller
     /**
      * Method to update ContractTypeL11n from request.
      *
-     * @param RequestAbstract  $request Request
-     * @param BaseStringL11n     $new     Model to modify
+     * @param RequestAbstract $request Request
+     * @param BaseStringL11n  $new     Model to modify
      *
      * @return BaseStringL11n
      *
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 5d67159..eb173de 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -224,8 +224,8 @@ final class ApiController extends Controller
     /**
      * Method to update Contract from request.
      *
-     * @param RequestAbstract  $request Request
-     * @param Contract     $new     Model to modify
+     * @param RequestAbstract $request Request
+     * @param Contract        $new     Model to modify
      *
      * @return Contract
      *
diff --git a/Models/Attribute/ContractAttributeMapper.php b/Models/Attribute/ContractAttributeMapper.php
index 5820081..9b00445 100644
--- a/Models/Attribute/ContractAttributeMapper.php
+++ b/Models/Attribute/ContractAttributeMapper.php
@@ -37,10 +37,10 @@ final class ContractAttributeMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'contractmgmt_contract_attr_id'    => ['name' => 'contractmgmt_contract_attr_id',    'type' => 'int', 'internal' => 'id'],
+        'contractmgmt_contract_attr_id'        => ['name' => 'contractmgmt_contract_attr_id',    'type' => 'int', 'internal' => 'id'],
         'contractmgmt_contract_attr_contract'  => ['name' => 'contractmgmt_contract_attr_contract',  'type' => 'int', 'internal' => 'ref'],
-        'contractmgmt_contract_attr_type'  => ['name' => 'contractmgmt_contract_attr_type',  'type' => 'int', 'internal' => 'type'],
-        'contractmgmt_contract_attr_value' => ['name' => 'contractmgmt_contract_attr_value', 'type' => 'int', 'internal' => 'value'],
+        'contractmgmt_contract_attr_type'      => ['name' => 'contractmgmt_contract_attr_type',  'type' => 'int', 'internal' => 'type'],
+        'contractmgmt_contract_attr_value'     => ['name' => 'contractmgmt_contract_attr_value', 'type' => 'int', 'internal' => 'value'],
     ];
 
     /**
diff --git a/Models/ContractMapper.php b/Models/ContractMapper.php
index eadca71..afb3fc0 100755
--- a/Models/ContractMapper.php
+++ b/Models/ContractMapper.php
@@ -18,9 +18,9 @@ namespace Modules\ContractManagement\Models;
 
 use Modules\Admin\Models\AccountMapper;
 use Modules\ContractManagement\Models\Attribute\ContractAttributeMapper;
+use Modules\Editor\Models\EditorDocMapper;
 use Modules\Media\Models\MediaMapper;
 use Modules\Organization\Models\UnitMapper;
-use Modules\Editor\Models\EditorDocMapper;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index 0c086a0..cdec695 100755
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -13,9 +13,9 @@
 declare(strict_types=1);
 
 return ['Navigation' => [
-    'Contract'  => 'Contract',
-    'Contracts' => 'Contracts',
+    'Contract'      => 'Contract',
+    'Contracts'     => 'Contracts',
     'ContractTypes' => 'Types',
-    'Create'    => 'Create',
-    'List'      => 'List',
+    'Create'        => 'Create',
+    'List'          => 'List',
 ]];
diff --git a/Theme/Backend/contract-single.tpl.php b/Theme/Backend/contract-single.tpl.php
index 8182db1..8a80485 100755
--- a/Theme/Backend/contract-single.tpl.php
+++ b/Theme/Backend/contract-single.tpl.php
@@ -12,8 +12,6 @@
  */
 declare(strict_types=1);
 
-use phpOMS\Uri\UriFactory;
-
 /**
  * @var \phpOMS\Views\View                          $this
  * @var \Modules\ContractManagement\Models\Contract $contract