diff --git a/Admin/Installer.php b/Admin/Installer.php
index 95d85cb..73cfdef 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -18,7 +18,6 @@ use Modules\QA\Models\QAApp;
 use Modules\QA\Models\QAAppMapper;
 use phpOMS\Application\ApplicationAbstract;
 use phpOMS\Config\SettingsInterface;
-use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\InstallerAbstract;
 use phpOMS\Module\ModuleInfo;
 
diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php
index 035e09c..375fba9 100644
--- a/Admin/Settings/Theme/Backend/settings.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings.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\QA\Models\QAApp[] $apps
  */
 $apps = $this->getData('apps') ?? [];
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 9692662..eaec95d 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -17,7 +17,6 @@ namespace Modules\QA\Controller;
 use Modules\Admin\Models\NullAccount;
 use Modules\Media\Models\NullMedia;
 use Modules\Profile\Models\Profile;
-use Modules\QA\Models\NullQAAnswer;
 use Modules\QA\Models\NullQAAnswerVote;
 use Modules\QA\Models\NullQAApp;
 use Modules\QA\Models\NullQAQuestion;
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index d371798..174c768 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -168,7 +168,7 @@ final class BackendController extends Controller
      *
      * @since 1.0.0
      */
-    public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, $data = null): RenderableInterface
+    public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response));
@@ -203,7 +203,7 @@ final class BackendController extends Controller
      *
      * @since 1.0.0
      */
-    public function viewAppSettings(RequestAbstract $request, ResponseAbstract $response, $data = null): RenderableInterface
+    public function viewAppSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings-app');
diff --git a/Models/QAAnswerVoteMapper.php b/Models/QAAnswerVoteMapper.php
index c8026aa..0158919 100755
--- a/Models/QAAnswerVoteMapper.php
+++ b/Models/QAAnswerVoteMapper.php
@@ -34,12 +34,12 @@ final class QAAnswerVoteMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'qa_answer_vote_id'         => ['name' => 'qa_answer_vote_id',         'type' => 'int',               'internal' => 'id'],
-        'qa_answer_vote_score'      => ['name' => 'qa_answer_vote_score',      'type' => 'int',               'internal' => 'score'],
-        'qa_answer_vote_answer'     => ['name' => 'qa_answer_vote_answer',     'type' => 'int',               'internal' => 'answer',    'readonly' => true],
-        'qa_answer_vote_created_by' => ['name' => 'qa_answer_vote_created_by', 'type' => 'int',               'internal' => 'createdBy', 'readonly' => true],
+        'qa_answer_vote_id'          => ['name' => 'qa_answer_vote_id',         'type' => 'int',               'internal' => 'id'],
+        'qa_answer_vote_score'       => ['name' => 'qa_answer_vote_score',      'type' => 'int',               'internal' => 'score'],
+        'qa_answer_vote_answer'      => ['name' => 'qa_answer_vote_answer',     'type' => 'int',               'internal' => 'answer',    'readonly' => true],
+        'qa_answer_vote_created_by'  => ['name' => 'qa_answer_vote_created_by', 'type' => 'int',               'internal' => 'createdBy', 'readonly' => true],
         'qa_answer_vote_created_for' => ['name' => 'qa_answer_vote_created_for', 'type' => 'int',               'internal' => 'createdFor', 'readonly' => true],
-        'qa_answer_vote_created_at' => ['name' => 'qa_answer_vote_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
+        'qa_answer_vote_created_at'  => ['name' => 'qa_answer_vote_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
     ];
 
     /**
diff --git a/Models/QAQuestion.php b/Models/QAQuestion.php
index 386d16b..e0ade2c 100755
--- a/Models/QAQuestion.php
+++ b/Models/QAQuestion.php
@@ -17,9 +17,9 @@ namespace Modules\QA\Models;
 use Modules\Media\Models\Media;
 use Modules\Profile\Models\NullProfile;
 use Modules\Profile\Models\Profile;
+use Modules\Tag\Models\NullTag;
 use Modules\Tag\Models\Tag;
 use phpOMS\Localization\ISO639x1Enum;
-use Modules\Tag\Models\NullTag;
 
 /**
  * QA question class.
diff --git a/Models/QAQuestionVoteMapper.php b/Models/QAQuestionVoteMapper.php
index c013505..e5ce9e5 100755
--- a/Models/QAQuestionVoteMapper.php
+++ b/Models/QAQuestionVoteMapper.php
@@ -34,12 +34,12 @@ final class QAQuestionVoteMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'qa_question_vote_id'         => ['name' => 'qa_question_vote_id',          'type' => 'int',               'internal' => 'id'],
-        'qa_question_vote_score'      => ['name' => 'qa_question_vote_score',       'type' => 'int',               'internal' => 'score'],
-        'qa_question_vote_question'   => ['name' => 'qa_question_vote_question',    'type' => 'int',               'internal' => 'question',  'readonly' => true],
-        'qa_question_vote_created_by' => ['name' => 'qa_question_vote_created_by',  'type' => 'int',               'internal' => 'createdBy', 'readonly' => true],
+        'qa_question_vote_id'          => ['name' => 'qa_question_vote_id',          'type' => 'int',               'internal' => 'id'],
+        'qa_question_vote_score'       => ['name' => 'qa_question_vote_score',       'type' => 'int',               'internal' => 'score'],
+        'qa_question_vote_question'    => ['name' => 'qa_question_vote_question',    'type' => 'int',               'internal' => 'question',  'readonly' => true],
+        'qa_question_vote_created_by'  => ['name' => 'qa_question_vote_created_by',  'type' => 'int',               'internal' => 'createdBy', 'readonly' => true],
         'qa_question_vote_created_for' => ['name' => 'qa_question_vote_created_for',  'type' => 'int',               'internal' => 'createdFor', 'readonly' => true],
-        'qa_question_vote_created_at' => ['name' => 'qa_question_vote_created_at',  'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
+        'qa_question_vote_created_at'  => ['name' => 'qa_question_vote_created_at',  'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
     ];
 
     /**
diff --git a/Theme/Backend/qa-question.tpl.php b/Theme/Backend/qa-question.tpl.php
index 9db2a6c..dee681e 100755
--- a/Theme/Backend/qa-question.tpl.php
+++ b/Theme/Backend/qa-question.tpl.php
@@ -101,7 +101,7 @@ echo $this->getData('nav')->render();
             <div class="score">
                 <div class="counter-area">
                     <div class="counter-container">
-                        <a id="qa-answer-upvote-<?= $answer->getId() ?>" data-action='[
+                        <a id="qa-answer-upvote-<?= $answer->getId(); ?>" data-action='[
                                 {
                                     "key": 1, "listener": "click", "action": [
                                         {"key": 1, "type": "event.prevent"},
@@ -113,7 +113,7 @@ echo $this->getData('nav')->render();
                         </a>
                         <span class="counter"><?= $answer->getVoteScore(); ?></span>
                         <span class="text">Score</span>
-                        <a id="qa-answer-downvote-<?= $answer->getId() ?>" data-action='[
+                        <a id="qa-answer-downvote-<?= $answer->getId(); ?>" data-action='[
                                 {
                                     "key": 1, "listener": "click", "action": [
                                         {"key": 1, "type": "event.prevent"},
@@ -125,7 +125,7 @@ echo $this->getData('nav')->render();
                         </a>
                     </div>
                     <div class="counter-container">
-                        <a id="qa-answer-accept-<?= $answer->getId() ?>" data-action='[
+                        <a id="qa-answer-accept-<?= $answer->getId(); ?>" data-action='[
                                 {
                                     "key": 1, "listener": "click", "action": [
                                         {"key": 1, "type": "event.prevent"},