diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 9153d8e..493a79a 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -15,15 +15,15 @@ declare(strict_types=1);
 namespace Modules\Comments\Controller;
 
 use Modules\Admin\Models\NullAccount;
-use Modules\Comments\Models\CommentList;
 use Modules\Comments\Models\Comment;
+use Modules\Comments\Models\CommentList;
+use Modules\Comments\Models\CommentListMapper;
+use Modules\Comments\Models\CommentMapper;
+use phpOMS\Message\NotificationLevel;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\Message\NotificationLevel;
 use phpOMS\Model\Message\FormValidation;
 use phpOMS\Utils\Parser\Markdown\Markdown;
-use Modules\Comments\Models\CommentMapper;
-use Modules\Comments\Models\CommentListMapper;
 
 /**
  * Comments controller class.
diff --git a/Theme/Backend/Components/Comment/create.tpl.php b/Theme/Backend/Components/Comment/create.tpl.php
index 29a1ec6..56ad453 100644
--- a/Theme/Backend/Components/Comment/create.tpl.php
+++ b/Theme/Backend/Components/Comment/create.tpl.php
@@ -1,6 +1,7 @@
-<?php
+<?php declare(strict_types=1);
 
 use phpOMS\Uri\UriFactory;
+
 ?>
 <div class="row">
     <div class="col-xs-12">
diff --git a/Theme/Backend/Components/Comment/list.tpl.php b/Theme/Backend/Components/Comment/list.tpl.php
index c9529da..156c5ae 100644
--- a/Theme/Backend/Components/Comment/list.tpl.php
+++ b/Theme/Backend/Components/Comment/list.tpl.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /** @var \Modules\Comments\Models\Comment[] $comments */
 $comments = $this->commentList->getComments();
 foreach ($comments as $comment) : ?>
diff --git a/tests/Models/CommentMapperTest.php b/tests/Models/CommentMapperTest.php
index bd0fce0..8623bc8 100755
--- a/tests/Models/CommentMapperTest.php
+++ b/tests/Models/CommentMapperTest.php
@@ -16,8 +16,8 @@ namespace Modules\Comments\tests\Models;
 
 use Modules\Admin\Models\NullAccount;
 use Modules\Comments\Models\Comment;
-use Modules\Comments\Models\CommentMapper;
 use Modules\Comments\Models\CommentList;
+use Modules\Comments\Models\CommentMapper;
 
 /**
  * @internal