diff --git a/artisan b/artisan
index 1f46ff31a..0cf63cb67 100755
--- a/artisan
+++ b/artisan
@@ -1,51 +1,53 @@
 #!/usr/bin/env php
 <?php
 
-/*
-|--------------------------------------------------------------------------
-| Register The Auto Loader
-|--------------------------------------------------------------------------
-|
-| Composer provides a convenient, automatically generated class loader
-| for our application. We just need to utilize it! We'll require it
-| into the script here so that we do not have to worry about the
-| loading of any our classes "manually". Feels great to relax.
-|
-*/
+    define('LARAVEL_START', microtime(true));
 
-require __DIR__.'/bootstrap/autoload.php';
+    /*
+    |--------------------------------------------------------------------------
+    | Register The Auto Loader
+    |--------------------------------------------------------------------------
+    |
+    | Composer provides a convenient, automatically generated class loader
+    | for our application. We just need to utilize it! We'll require it
+    | into the script here so that we do not have to worry about the
+    | loading of any of our classes manually. It's great to relax.
+    |
+    */
 
-$app = require __DIR__.'/bootstrap/app.php';
+    require __DIR__.'/vendor/autoload.php';
 
-/*
-|--------------------------------------------------------------------------
-| Run The Artisan Application
-|--------------------------------------------------------------------------
-|
-| When we run the console application, the current CLI command will be
-| executed in this console and the response sent back to a terminal
-| or another output device for the developers. Here goes nothing!
-|
-*/
+    $app = require_once __DIR__.'/bootstrap/app.php';
 
-$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
+    /*
+    |--------------------------------------------------------------------------
+    | Run The Artisan Application
+    |--------------------------------------------------------------------------
+    |
+    | When we run the console application, the current CLI command will be
+    | executed in this console and the response sent back to a terminal
+    | or another output device for the developers. Here goes nothing!
+    |
+    */
 
-$status = $kernel->handle(
-    $input = new Symfony\Component\Console\Input\ArgvInput,
-    new Symfony\Component\Console\Output\ConsoleOutput
-);
+    $kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
 
-/*
-|--------------------------------------------------------------------------
-| Shutdown The Application
-|--------------------------------------------------------------------------
-|
-| Once Artisan has finished running, we will fire off the shutdown events
-| so that any final work may be done by the application before we shut
-| down the process. This is the last thing to happen to the request.
-|
-*/
+    $status = $kernel->handle(
+        $input = new Symfony\Component\Console\Input\ArgvInput,
+        new Symfony\Component\Console\Output\ConsoleOutput
+    );
 
-$kernel->terminate($input, $status);
+    /*
+    |--------------------------------------------------------------------------
+    | Shutdown The Application
+    |--------------------------------------------------------------------------
+    |
+    | Once Artisan has finished running, we will fire off the shutdown events
+    | so that any final work may be done by the application before we shut
+    | down the process. This is the last thing to happen to the request.
+    |
+    */
 
-exit($status);
+    $kernel->terminate($input, $status);
+
+    exit($status);
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index eec58a304..c8f53a99c 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -1,15 +1,17 @@
 <?php
 
-require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'autoload.php';
-require __DIR__.DIRECTORY_SEPARATOR.'app.php';
-require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'app/Extensions/util/PhpYenc.php';
+    use Dotenv\Dotenv;
+    use Dotenv\Repository\RepositoryBuilder;
+    use Illuminate\Contracts\Console\Kernel;
 
-use Dotenv\Dotenv;
-use Dotenv\Repository\RepositoryBuilder;
+    require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'autoload.php';
+    require __DIR__.DIRECTORY_SEPARATOR.'app.php';
+    require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'app/Extensions/util/PhpYenc.php';
 
-$repository = RepositoryBuilder::createWithDefaultAdapters()
-    ->make();
+    $repository = RepositoryBuilder::createWithDefaultAdapters()->make();
 
-$dotenv = Dotenv::create($repository, dirname(__DIR__, 1), null)->load();
+    $dotenv = Dotenv::create($repository, dirname(__DIR__, 1), null)->load();
 
-$app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();
+    /** @var Kernel $kernel */
+    $kernel = app(Kernel::class);
+    $kernel->bootstrap();
diff --git a/public/index.php b/public/index.php
index 8eb0733d7..58500ccd5 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,15 +1,55 @@
 <?php
 
-require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'bootstrap/autoload.php';
+    use Illuminate\Contracts\Http\Kernel;
+    use Illuminate\Http\Request;
 
-define('LARAVEL_START', microtime(true));
+    define('LARAVEL_START', microtime(true));
 
-if (file_exists(__DIR__.'/../storage/framework/maintenance.php')) {
-    require __DIR__.'/../storage/framework/maintenance.php';
-}
+    /*
+    |--------------------------------------------------------------------------
+    | Check If The Application Is Under Maintenance
+    |--------------------------------------------------------------------------
+    |
+    | If the application is in maintenance / demo mode via the "down" command
+    | we will load this file so that any pre-rendered content can be shown
+    | instead of starting the framework, which could cause an exception.
+    |
+    */
 
-$kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);
+    if (file_exists($maintenance = __DIR__.'/../storage/framework/maintenance.php')) {
+        require $maintenance;
+    }
 
-$response = $kernel->handle($request = Illuminate\Http\Request::capture());
-$response->send();
-$kernel->terminate($request, $response);
+    /*
+    |--------------------------------------------------------------------------
+    | Register The Auto Loader
+    |--------------------------------------------------------------------------
+    |
+    | Composer provides a convenient, automatically generated class loader for
+    | this application. We just need to utilize it! We'll simply require it
+    | into the script here so we don't need to manually load our classes.
+    |
+    */
+
+    require __DIR__.'/../vendor/autoload.php';
+
+    /*
+    |--------------------------------------------------------------------------
+    | Run The Application
+    |--------------------------------------------------------------------------
+    |
+    | Once we have the application, we can handle the incoming request using
+    | the application's HTTP kernel. Then, we will send the response back
+    | to this client's browser, allowing them to enjoy our application.
+    |
+    */
+
+    $app = require_once __DIR__.'/../bootstrap/app.php';
+
+    $kernel = $app->make(Kernel::class);
+
+    $response = $kernel->handle(
+        $request = Request::capture()
+    )->send();
+
+    $kernel->terminate($request, $response);