diff --git a/flight/Flight.php b/flight/Flight.php
index f34c975..34b7bd5 100644
--- a/flight/Flight.php
+++ b/flight/Flight.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * Flight: An extensible micro-framework.
  *
@@ -9,6 +7,8 @@ declare(strict_types=1);
  * @license     MIT, http://flightphp.com/license
  */
 
+declare(strict_types=1);
+
 use flight\core\Dispatcher;
 use flight\Engine;
 use flight\net\Request;
@@ -150,7 +150,6 @@ class Flight
      * Set the engine instance
      *
      * @param Engine $engine Vroom vroom!
-     * @return void
      */
     public static function setEngine(Engine $engine): void
     {
diff --git a/flight/autoload.php b/flight/autoload.php
index cad9da1..24f9643 100644
--- a/flight/autoload.php
+++ b/flight/autoload.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * Flight: An extensible micro-framework.
  *
@@ -9,6 +7,8 @@ declare(strict_types=1);
  * @license     MIT, http://flightphp.com/license
  */
 
+declare(strict_types=1);
+
 use flight\core\Loader;
 
 require_once __DIR__ . '/core/Loader.php';
diff --git a/flight/core/Dispatcher.php b/flight/core/Dispatcher.php
index 1c1cd52..8bd51fa 100644
--- a/flight/core/Dispatcher.php
+++ b/flight/core/Dispatcher.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * Flight: An extensible micro-framework.
  *
@@ -9,6 +7,8 @@ declare(strict_types=1);
  * @license     MIT, http://flightphp.com/license
  */
 
+declare(strict_types=1);
+
 namespace flight\core;
 
 use Exception;
diff --git a/flight/core/Loader.php b/flight/core/Loader.php
index b4e8efa..e9ac837 100644
--- a/flight/core/Loader.php
+++ b/flight/core/Loader.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * Flight: An extensible micro-framework.
  *
@@ -9,6 +7,8 @@ declare(strict_types=1);
  * @license     MIT, http://flightphp.com/license
  */
 
+declare(strict_types=1);
+
 namespace flight\core;
 
 use Closure;
diff --git a/flight/database/PdoWrapper.php b/flight/database/PdoWrapper.php
index 51886d9..ffa4c0c 100644
--- a/flight/database/PdoWrapper.php
+++ b/flight/database/PdoWrapper.php
@@ -111,10 +111,11 @@ class PdoWrapper extends PDO
      */
     protected function processInStatementSql(string $sql, array $params = []): array
     {
-
-        // Handle "IN(?)". This is to be used with a comma delimited string, but can also be used with an array.
-        // Remove the spaces in variations of "IN ( ? )" where the space after IN is optional, and any number of spaces before and after the question mark is optional.
-        // Then loop through each "IN(?)" in the query and replace the single question mark with the correct number of question marks.
+        /* Handle "IN(?)". This is to be used with a comma delimited string, but can also be used with an array.
+        Remove the spaces in variations of "IN ( ? )" where the space after IN is optional, and any number of
+        spaces before and after the question mark is optional.
+        Then loop through each "IN(?)" in the query and replace the single question mark with the correct
+        number of question marks. */
         $sql = preg_replace('/IN\s*\(\s*\?\s*\)/i', 'IN(?)', $sql);
         $current_index = 0;
         while (($current_index = strpos($sql, 'IN(?)', $current_index)) !== false) {
diff --git a/flight/net/Request.php b/flight/net/Request.php
index 846896a..278af08 100644
--- a/flight/net/Request.php
+++ b/flight/net/Request.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * Flight: An extensible micro-framework.
  *
@@ -9,6 +7,8 @@ declare(strict_types=1);
  * @license     MIT, http://flightphp.com/license
  */
 
+declare(strict_types=1);
+
 namespace flight\net;
 
 use flight\util\Collection;
diff --git a/flight/net/Response.php b/flight/net/Response.php
index 8f290dd..c96a20a 100644
--- a/flight/net/Response.php
+++ b/flight/net/Response.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * Flight: An extensible micro-framework.
  *
@@ -9,6 +7,8 @@ declare(strict_types=1);
  * @license     MIT, http://flightphp.com/license
  */
 
+declare(strict_types=1);
+
 namespace flight\net;
 
 use Exception;
@@ -288,7 +288,10 @@ class Response
      * Sets a real header. Mostly used for test mocking.
      *
      * @param string $header_string The header string you would pass to header()
-     * @param bool $replace The optional replace parameter indicates whether the header should replace a previous similar header, or add a second header of the same type. By default it will replace, but if you pass in false as the second argument you can force multiple headers of the same type.
+     * @param bool $replace The optional replace parameter indicates whether the
+     * header should replace a previous similar header, or add a second header of
+     * the same type. By default it will replace, but if you pass in false as the
+     * second argument you can force multiple headers of the same type.
      * @param int $response_code The response code to send
      * @return $this
      * @codeCoverageIgnore
diff --git a/flight/net/Route.php b/flight/net/Route.php
index cdf67ef..f65910a 100644
--- a/flight/net/Route.php
+++ b/flight/net/Route.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * Flight: An extensible micro-framework.
  *
@@ -9,6 +7,8 @@ declare(strict_types=1);
  * @license     MIT, http://flightphp.com/license
  */
 
+declare(strict_types=1);
+
 namespace flight\net;
 
 /**
@@ -132,11 +132,9 @@ class Route
             $regex
         );
 
-        // Fix trailing slash
-        if ('/' === $last_char) {
+        if ('/' === $last_char) { // Fix trailing slash
             $regex .= '?';
-        } // Allow trailing slash
-        else {
+        } else { // Allow trailing slash
             $regex .= '/?';
         }
 
diff --git a/flight/net/Router.php b/flight/net/Router.php
index 5c4e99b..607942e 100644
--- a/flight/net/Router.php
+++ b/flight/net/Router.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * Flight: An extensible micro-framework.
  *
@@ -9,6 +7,8 @@ declare(strict_types=1);
  * @license     MIT, http://flightphp.com/license
  */
 
+declare(strict_types=1);
+
 namespace flight\net;
 
 use Exception;
@@ -166,7 +166,8 @@ class Router
      *
      * @param string   $group_prefix group URL prefix (such as /api/v1)
      * @param callable $callback     The necessary calling that holds the Router class
-     * @param array<int,callable|object>  $group_middlewares The middlewares to be applied to the group Ex: [ $middleware1, $middleware2 ]
+     * @param array<int, callable|object> $group_middlewares The middlewares to be
+     * applied to the group Ex: [ $middleware1, $middleware2 ]
      */
     public function group(string $group_prefix, callable $callback, array $group_middlewares = []): void
     {
diff --git a/flight/template/View.php b/flight/template/View.php
index 7d08623..d0c5f3b 100644
--- a/flight/template/View.php
+++ b/flight/template/View.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * Flight: An extensible micro-framework.
  *
@@ -9,6 +7,8 @@ declare(strict_types=1);
  * @license     MIT, http://flightphp.com/license
  */
 
+declare(strict_types=1);
+
 namespace flight\template;
 
 /**
diff --git a/flight/util/Collection.php b/flight/util/Collection.php
index 4d8dd36..3c1317c 100644
--- a/flight/util/Collection.php
+++ b/flight/util/Collection.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * Flight: An extensible micro-framework.
  *
@@ -9,6 +7,8 @@ declare(strict_types=1);
  * @license     MIT, http://flightphp.com/license
  */
 
+declare(strict_types=1);
+
 namespace flight\util;
 
 use ArrayAccess;