diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 047d412..0ae0aa7 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -293,9 +293,7 @@ final class ApiController extends Controller
      */
     private function createHistory(EditorDoc $doc) : EditorDocHistory
     {
-        $history = EditorDocHistory::createFromDoc($doc);
-
-        return $history;
+        return EditorDocHistory::createFromDoc($doc);
     }
 
     /**
diff --git a/Theme/Backend/Components/Editor/inline-editor.tpl.php b/Theme/Backend/Components/Editor/inline-editor.tpl.php
index dfe9790..919575c 100755
--- a/Theme/Backend/Components/Editor/inline-editor.tpl.php
+++ b/Theme/Backend/Components/Editor/inline-editor.tpl.php
@@ -1,7 +1,7 @@
 <div id="<?= $this->renderId(); ?>" class="tabview tab-2 m-editor wf-100">
     <ul class="tab-links">
         <li><label tabindex="0" for="<?= $this->renderId(); ?>-c-tab-1"><?= $this->getHtml('Text', 'Editor'); ?></label>
-        <li<?= !empty($this->plain) ? ' class="active"' : ''; ?>><label tabindex="0" for="<?= $this->renderId(); ?>-c-tab-2"><?= $this->getHtml('Preview', 'Editor'); ?></label>
+        <li<?= empty($this->plain) ? '' : ' class="active"'; ?>><label tabindex="0" for="<?= $this->renderId(); ?>-c-tab-2"><?= $this->getHtml('Preview', 'Editor'); ?></label>
     </ul>
     <div class="tab-content">
         <input type="radio" id="<?= $this->renderId(); ?>-c-tab-1" name="tabular-1"<?= empty($this->plain) ? ' checked' : ''; ?>>
@@ -17,7 +17,7 @@
             <input type="hidden" id="<?= $this->renderId(); ?>-parsed">
         </div>
 
-        <input type="radio" id="<?= $this->renderId(); ?>-c-tab-2" name="tabular-1"<?= !empty($this->plain) ? ' checked' : ''; ?>>
+        <input type="radio" id="<?= $this->renderId(); ?>-c-tab-2" name="tabular-1"<?= empty($this->plain) ? '' : ' checked'; ?>>
         <div class="tab">
             <article data-tpl-text="<?= $this->renderTplText(); ?>" data-tpl-value="<?= $this->renderTplValue(); ?>"><?= $this->renderPreview(); ?></article>
         </div>
diff --git a/Theme/Backend/editor-single.tpl.php b/Theme/Backend/editor-single.tpl.php
index eff9860..2c431a0 100755
--- a/Theme/Backend/editor-single.tpl.php
+++ b/Theme/Backend/editor-single.tpl.php
@@ -35,7 +35,7 @@ echo $this->data['nav']->render(); ?>
                 <article><?= $doc->content; ?></article>
                 <?php if (!empty($tags)) : ?>
                     <?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 endif; ?>
                 <?php if (!empty($files)) : ?>
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);
     });