diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 1b0140a..f6f4f5f 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -284,9 +284,7 @@ final class ApiController extends Controller
      */
     private function createHistory(WikiDoc $doc) : WikiDocHistory
     {
-        $history = WikiDocHistory::createFromDoc($doc);
-
-        return $history;
+        return WikiDocHistory::createFromDoc($doc);
     }
 
     /**
diff --git a/Theme/Backend/wiki-dashboard.tpl.php b/Theme/Backend/wiki-dashboard.tpl.php
index 3a488aa..88c4ca4 100755
--- a/Theme/Backend/wiki-dashboard.tpl.php
+++ b/Theme/Backend/wiki-dashboard.tpl.php
@@ -38,7 +38,7 @@ echo $this->data['nav']->render(); ?>
                             <?= Markdown::parse(\substr($doc->docRaw, 0, 500)); ?>
                         </article>
                         <?php $tags = $doc->getTags(); foreach ($tags as $tag) : ?>
-                            <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= !empty($tag->icon) ? '<i class="' . $this->printHtml($tag->icon) . '"></i>' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
+                            <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= empty($tag->icon) ? '' : '<i class="' . $this->printHtml($tag->icon) . '"></i>'; ?><?= $this->printHtml($tag->getL11n()); ?></span>
                         <?php endforeach; ?>
                     </div>
                     <div class="portlet-foot">
diff --git a/Theme/Backend/wiki-doc-single.tpl.php b/Theme/Backend/wiki-doc-single.tpl.php
index d46d0a9..0357ba4 100755
--- a/Theme/Backend/wiki-doc-single.tpl.php
+++ b/Theme/Backend/wiki-doc-single.tpl.php
@@ -42,7 +42,7 @@ echo $this->data['nav']->render();
                 <article><?= $doc->doc; ?></article>
 
                 <?php foreach ($tags as $tag) : ?>
-                    <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= !empty($tag->icon) ? '<i class="' . $this->printHtml($tag->icon) . '"></i>' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
+                    <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= empty($tag->icon) ? '' : '<i class="' . $this->printHtml($tag->icon) . '"></i>'; ?><?= $this->printHtml($tag->getL11n()); ?></span>
                 <?php endforeach; ?>
 
                 <?php $files = $doc->getMedia(); foreach ($files as $file) : ?>
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index b904f0c..44438e2 100755
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -381,7 +381,7 @@ function phpServe() : void
 
     // Execute the command and store the process ID
     $output = [];
-    echo \sprintf('Starting server...') . \PHP_EOL;
+    echo 'Starting server...' . \PHP_EOL;
     echo \sprintf(' Current directory: %s', \getcwd()) . \PHP_EOL;
     echo \sprintf(' %s', $command);
     \exec($command, $output);
@@ -406,7 +406,7 @@ function phpServe() : void
 
     // Kill the web server when the process ends
     \register_shutdown_function(function() use ($killCommand, $pid) : void {
-        echo \PHP_EOL . \sprintf('Stopping server...') . \PHP_EOL;
+        echo \PHP_EOL . 'Stopping server...' . \PHP_EOL;
         echo \sprintf(' %s - Killing process with ID %d', \date('r'), $pid) . \PHP_EOL;
         \exec($killCommand . $pid);
     });