diff --git a/Admin/Routes/Cli.php b/Admin/Routes/Cli.php
index 7acd36f..66ccafa 100644
--- a/Admin/Routes/Cli.php
+++ b/Admin/Routes/Cli.php
@@ -8,5 +8,5 @@ return [
             'dest' => '\Modules\Workflow\Controller\CliController:cliWorkflowInstanceCreate',
             'verb' => RouteVerb::PUT,
         ],
-    ]
+    ],
 ];
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 393c0d3..8064a50 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -14,13 +14,11 @@ declare(strict_types=1);
 
 namespace Modules\Workflow\Controller;
 
-use Modules\Admin\Models\AccountPermission;
 use Modules\Admin\Models\NullAccount;
 use Modules\Media\Models\CollectionMapper;
 use Modules\Media\Models\NullCollection;
 use Modules\Media\Models\NullMedia;
 use Modules\Workflow\Models\PermissionCategory;
-use Modules\Workflow\Models\WorkflowInstance;
 use Modules\Workflow\Models\WorkflowInstanceAbstract;
 use Modules\Workflow\Models\WorkflowInstanceMapper;
 use Modules\Workflow\Models\WorkflowStatus;
@@ -28,6 +26,7 @@ use Modules\Workflow\Models\WorkflowTemplate;
 use Modules\Workflow\Models\WorkflowTemplateMapper;
 use phpOMS\Account\PermissionType;
 use phpOMS\Autoloader;
+use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
@@ -39,7 +38,6 @@ use phpOMS\System\MimeType;
 use phpOMS\Utils\Parser\Markdown\Markdown;
 use phpOMS\Utils\StringUtils;
 use phpOMS\Views\View;
-use phpOMS\DataStorage\Database\Schema\Builder as SchemaBuilder;
 
 /**
  * Workflow controller class.
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 66b4599..2ef08ee 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -17,10 +17,7 @@ namespace Modules\Workflow\Controller;
 use Modules\Media\Models\CollectionMapper;
 use Modules\Media\Models\NullMedia;
 use Modules\Workflow\Models\WorkflowControllerInterface;
-use Modules\Workflow\Models\WorkflowInstanceMapper;
-use Modules\Workflow\Models\WorkflowStatus;
 use Modules\Workflow\Models\WorkflowTemplateMapper;
-use Modules\Workflow\Models\WorkflowTemplateStatus;
 use phpOMS\Contract\RenderableInterface;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
diff --git a/Models/WorkflowInstanceMapper.php b/Models/WorkflowInstanceMapper.php
index 5250ad6..a347b98 100644
--- a/Models/WorkflowInstanceMapper.php
+++ b/Models/WorkflowInstanceMapper.php
@@ -15,13 +15,7 @@ declare(strict_types=1);
 namespace Modules\Workflow\Models;
 
 use Modules\Admin\Models\AccountMapper;
-use Modules\Calendar\Models\ScheduleMapper;
-use Modules\Media\Models\MediaMapper;
-use Modules\Tag\Models\TagMapper;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
-use phpOMS\DataStorage\Database\Mapper\ReadMapper;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Where;
 
 /**
  * Mapper class.
@@ -41,7 +35,7 @@ final class WorkflowInstanceMapper extends DataMapperFactory
      */
     public const COLUMNS = [
         'workflow_instance_id'                => ['name' => 'workflow_instance_id',         'type' => 'int',      'internal' => 'id'],
-        'workflow_instance_template'         => ['name' => 'workflow_instance_template',         'type' => 'int',               'internal' => 'template'],
+        'workflow_instance_template'          => ['name' => 'workflow_instance_template',         'type' => 'int',               'internal' => 'template'],
         'workflow_instance_created_at'        => ['name' => 'workflow_instance_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
         'workflow_instance_created_by'        => ['name' => 'workflow_instance_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true],
     ];
diff --git a/Models/WorkflowTemplateMapper.php b/Models/WorkflowTemplateMapper.php
index 5c2e2c3..67927c6 100644
--- a/Models/WorkflowTemplateMapper.php
+++ b/Models/WorkflowTemplateMapper.php
@@ -36,11 +36,11 @@ final class WorkflowTemplateMapper extends DataMapperFactory
      */
     public const COLUMNS = [
         'workflow_template_id'                => ['name' => 'workflow_template_id',         'type' => 'int',      'internal' => 'id'],
-        'workflow_template_status'        => ['name' => 'workflow_template_status',      'type' => 'int',      'internal' => 'status'],
-        'workflow_template_name'         => ['name' => 'workflow_template_name',       'type' => 'string',   'internal' => 'name'],
-        'workflow_template_desc'         => ['name' => 'workflow_template_desc',       'type' => 'string',   'internal' => 'description'],
-        'workflow_template_descRaw'         => ['name' => 'workflow_template_descRaw',       'type' => 'string',   'internal' => 'descriptionRaw'],
-        'workflow_template_media'         => ['name' => 'workflow_template_media',       'type' => 'string',   'internal' => 'source'],
+        'workflow_template_status'            => ['name' => 'workflow_template_status',      'type' => 'int',      'internal' => 'status'],
+        'workflow_template_name'              => ['name' => 'workflow_template_name',       'type' => 'string',   'internal' => 'name'],
+        'workflow_template_desc'              => ['name' => 'workflow_template_desc',       'type' => 'string',   'internal' => 'description'],
+        'workflow_template_descRaw'           => ['name' => 'workflow_template_descRaw',       'type' => 'string',   'internal' => 'descriptionRaw'],
+        'workflow_template_media'             => ['name' => 'workflow_template_media',       'type' => 'string',   'internal' => 'source'],
         'workflow_template_created_at'        => ['name' => 'workflow_template_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
         'workflow_template_created_by'        => ['name' => 'workflow_template_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true],
     ];
diff --git a/Theme/Backend/workflow-template-list.tpl.php b/Theme/Backend/workflow-template-list.tpl.php
index 8e9a471..dd21c3f 100755
--- a/Theme/Backend/workflow-template-list.tpl.php
+++ b/Theme/Backend/workflow-template-list.tpl.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
 use phpOMS\Uri\UriFactory;
 
 /**
- * @var \phpOMS\Views\View                $this
+ * @var \phpOMS\Views\View                  $this
  * @var \Modules\Workflow\Models\Template[] $templates
  */
 $templates = $this->getData('reports');