diff --git a/Admin/Install/Application/QA/Themes/Default/tpl/profile.tpl.php b/Admin/Install/Application/QA/Themes/Default/tpl/profile.tpl.php
index f2af605..0257298 100755
--- a/Admin/Install/Application/QA/Themes/Default/tpl/profile.tpl.php
+++ b/Admin/Install/Application/QA/Themes/Default/tpl/profile.tpl.php
@@ -12,8 +12,6 @@
  */
 declare(strict_types=1);
 
-use phpOMS\Uri\UriFactory;
-
 ?>
 
 <div class="content">
diff --git a/Admin/Install/CMS.php b/Admin/Install/CMS.php
index 3302c1c..58409ea 100755
--- a/Admin/Install/CMS.php
+++ b/Admin/Install/CMS.php
@@ -14,8 +14,6 @@ declare(strict_types=1);
 
 namespace Modules\QA\Admin\Install;
 
-use Model\Setting;
-use Model\SettingMapper;
 use phpOMS\Application\ApplicationAbstract;
 
 /**
diff --git a/Admin/Installer.php b/Admin/Installer.php
index b4ba551..77cf0d3 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -31,7 +31,7 @@ use phpOMS\Module\ModuleInfo;
  */
 final class Installer extends InstallerAbstract
 {
-	/**
+    /**
      * {@inheritdoc}
      */
     public static function install(DatabasePool $dbPool, ModuleInfo $info, SettingsInterface $cfgHandler) : void
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 8f6c257..81f40c2 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -352,7 +352,7 @@ final class ApiController extends Controller
      */
     public function createQAAppFromRequest(RequestAbstract $request) : QAApp
     {
-        $app = new QAApp();
+        $app       = new QAApp();
         $app->name = $request->getData('name') ?? '';
 
         return $app;
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 67836ec..dcae260 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,14 +14,14 @@ declare(strict_types=1);
 
 namespace Modules\QA\Controller;
 
-use Modules\QA\Models\QAQuestionMapper;
 use Modules\QA\Models\QAAppMapper;
+use Modules\QA\Models\QAHelperMapper;
+use Modules\QA\Models\QAQuestionMapper;
 use phpOMS\Asset\AssetType;
 use phpOMS\Contract\RenderableInterface;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Views\View;
-use Modules\QA\Models\QAHelperMapper;
 
 /**
  * QA backend controller class.
diff --git a/Models/QAAnswerVoteMapper.php b/Models/QAAnswerVoteMapper.php
index 8812629..5099089 100755
--- a/Models/QAAnswerVoteMapper.php
+++ b/Models/QAAnswerVoteMapper.php
@@ -88,7 +88,7 @@ final class QAAnswerVoteMapper extends DataMapperAbstract
      *
      * @since 1.0.0
      */
-    public static function findVote(int $answer, int $account) : bool|QAAnswerVote
+    public static function findVote(int $answer, int $account) : bool | QAAnswerVote
     {
         $depth = 3;
         $query = self::getQuery();
diff --git a/Models/QAHelperMapper.php b/Models/QAHelperMapper.php
index 3ffcf84..7303597 100644
--- a/Models/QAHelperMapper.php
+++ b/Models/QAHelperMapper.php
@@ -38,7 +38,7 @@ final class QAHelperMapper extends DataMapperAbstract
 	{
         $scores = [];
 
-		$query         = new Builder(self::$db);
+		$query               = new Builder(self::$db);
         $questionScore = $query->select('qa_question_created_by')
             ->selectAs('SUM(qa_question_vote_score)', 'score')
             ->from(QAQuestionVoteMapper::getTable())
diff --git a/Models/QAQuestionMapper.php b/Models/QAQuestionMapper.php
index 88fbb77..de1c2ff 100755
--- a/Models/QAQuestionMapper.php
+++ b/Models/QAQuestionMapper.php
@@ -43,7 +43,7 @@ final class QAQuestionMapper extends DataMapperAbstract
         'qa_question_status'         => ['name' => 'qa_question_status',     'type' => 'int',      'internal' => 'status'],
         'qa_question_created_by'     => ['name' => 'qa_question_created_by', 'type' => 'int',      'internal' => 'createdBy', 'readonly' => true],
         'qa_question_created_at'     => ['name' => 'qa_question_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
-        'qa_question_app'     => ['name' => 'qa_question_app', 'type' => 'int', 'internal' => 'app'],
+        'qa_question_app'            => ['name' => 'qa_question_app', 'type' => 'int', 'internal' => 'app'],
     ];
 
     /**
diff --git a/Models/QAQuestionVoteMapper.php b/Models/QAQuestionVoteMapper.php
index 1433a95..40b8284 100755
--- a/Models/QAQuestionVoteMapper.php
+++ b/Models/QAQuestionVoteMapper.php
@@ -88,7 +88,7 @@ final class QAQuestionVoteMapper extends DataMapperAbstract
      *
      * @since 1.0.0
      */
-    public static function findVote(int $question, int $account) : bool|QAQuestionVote
+    public static function findVote(int $question, int $account) : bool | QAQuestionVote
     {
         $depth = 3;
         $query = self::getQuery();
diff --git a/Theme/Backend/qa-question.tpl.php b/Theme/Backend/qa-question.tpl.php
index 3a273c2..552484f 100755
--- a/Theme/Backend/qa-question.tpl.php
+++ b/Theme/Backend/qa-question.tpl.php
@@ -59,7 +59,7 @@ echo $this->getData('nav')->render();
                     <a class="account-info" href="<?= UriFactory::build('{/prefix}profile/single?{?}&id=' . $question->createdBy->getId()); ?>">
                         <span class="name">
                             <div class="content"><?= $this->printHtml($question->createdBy->account->name2); ?>, <?= $this->printHtml($question->createdBy->account->name1); ?></div>
-                            <div class="name-score">Score: <?= $scores[$question->createdBy->account->getId()] ?? 0 ?></div>
+                            <div class="name-score">Score: <?= $scores[$question->createdBy->account->getId()] ?? 0; ?></div>
                         </span>
 
                         <?php if ($question->createdBy->image !== null && !($question->createdBy->image instanceof NullMedia)) : ?>
@@ -100,7 +100,7 @@ echo $this->getData('nav')->render();
                     <a class="account-info" href="<?= UriFactory::build('{/prefix}profile/single?{?}&id=' . $answer->createdBy->getId()); ?>">
                         <span class="name">
                             <div class="content"><?= $this->printHtml($answer->createdBy->account->name2); ?> <?= $this->printHtml($answer->createdBy->account->name1); ?></div>
-                            <div class="name-score">Score: <?= $scores[$answer->createdBy->account->getId()] ?? 0 ?></div>
+                            <div class="name-score">Score: <?= $scores[$answer->createdBy->account->getId()] ?? 0; ?></div>
                         </span>
                         <?php if ($answer->createdBy->image !== null && !($answer->createdBy->image instanceof NullMedia)) : ?>
                             <img width="40px" alt="<?= $this->getHtml('AccountImage', '0', '0'); ?>" loading="lazy" src="<?= UriFactory::build('{/prefix}' . $answer->createdBy->image->getPath()); ?>">