diff --git a/lib/Request.php b/lib/Request.php
index df517bb4..858f1313 100644
--- a/lib/Request.php
+++ b/lib/Request.php
@@ -110,7 +110,7 @@ class Request
             case 'POST':
                 // it might be a creation or a deletion, the latter is detected below
                 $this->_operation = 'create';
-                $this->_params = Json::decode(
+                $this->_params    = Json::decode(
                     file_get_contents(self::$_inputStream)
                 );
                 break;
@@ -130,7 +130,7 @@ class Request
         if (array_key_exists('pasteid', $this->_params) && !empty($this->_params['pasteid'])) {
             if (array_key_exists('deletetoken', $this->_params) && !empty($this->_params['deletetoken'])) {
                 $this->_operation = 'delete';
-            } else if ($this->_operation != 'create') {
+            } elseif ($this->_operation != 'create') {
                 $this->_operation = 'read';
             }
         } elseif (array_key_exists('jsonld', $this->_params) && !empty($this->_params['jsonld'])) {
diff --git a/tst/Bootstrap.php b/tst/Bootstrap.php
index bdf8a384..97f9405d 100644
--- a/tst/Bootstrap.php
+++ b/tst/Bootstrap.php
@@ -1,13 +1,11 @@
 <?php
 
-use Google\Auth\HttpHandler\HttpHandlerFactory;
 use Google\Cloud\Core\Exception\BadRequestException;
 use Google\Cloud\Core\Exception\NotFoundException;
 use Google\Cloud\Storage\Bucket;
 use Google\Cloud\Storage\Connection\ConnectionInterface;
 use Google\Cloud\Storage\StorageClient;
 use Google\Cloud\Storage\StorageObject;
-use GuzzleHttp\Client;
 use PrivateBin\Data\GoogleCloudStorage;
 use PrivateBin\Persistence\ServerSalt;
 
diff --git a/tst/ModelTest.php b/tst/ModelTest.php
index fb82442e..327e7013 100644
--- a/tst/ModelTest.php
+++ b/tst/ModelTest.php
@@ -343,9 +343,9 @@ class ModelTest extends PHPUnit_Framework_TestCase
      */
     public function testInvalidPasteFormat()
     {
-        $pasteData = Helper::getPastePost();
+        $pasteData             = Helper::getPastePost();
         $pasteData['adata'][1] = 'format does not exist';
-        $paste = $this->_model->getPaste();
+        $paste                 = $this->_model->getPaste();
         $paste->setData($pasteData);
     }