diff --git a/artisan b/artisan
index df3993e90..961e94d0b 100644
--- a/artisan
+++ b/artisan
@@ -1,32 +1,20 @@
 #!/usr/bin/env php
 <?php
 
-define('LARAVEL_START', microtime(true));
-
 /*
 |--------------------------------------------------------------------------
-| Bootstrap dependencies
+| Register The Auto Loader
 |--------------------------------------------------------------------------
 |
-| We use a custom bootstrap autoloader to load some October dependencies
-| first, before bringing in all dependencies from Composer.
+| 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.
 |
 */
 
 require __DIR__.'/bootstrap/autoload.php';
 
-/*
-|--------------------------------------------------------------------------
-| Turn On The Lights
-|--------------------------------------------------------------------------
-|
-| We need to illuminate PHP development, so let us turn on the lights.
-| This bootstraps the framework and gets it ready for use, then it
-| will load up this application so that we can run it and send
-| the responses back to the browser and delight our users.
-|
-*/
-
 $app = require_once __DIR__.'/bootstrap/app.php';
 
 /*
@@ -40,7 +28,7 @@ $app = require_once __DIR__.'/bootstrap/app.php';
 |
 */
 
-$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
+$kernel = $app->make('Illuminate\Contracts\Console\Kernel');
 
 $status = $kernel->handle(
     $input = new Symfony\Component\Console\Input\ArgvInput,
@@ -60,4 +48,4 @@ $status = $kernel->handle(
 
 $kernel->terminate($input, $status);
 
-exit($status);
+exit($status);
\ No newline at end of file
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index 9a131647a..6533c54ca 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -1,5 +1,7 @@
 <?php
 
+define('LARAVEL_START', microtime(true));
+
 /*
 |--------------------------------------------------------------------------
 | Register Core Helpers
diff --git a/index.php b/index.php
index 4e112fc52..9c4d23a06 100644
--- a/index.php
+++ b/index.php
@@ -6,15 +6,12 @@
  * @author   Alexey Bobkov, Samuel Georges
  */
 
-define('LARAVEL_START', microtime(true));
-
 /*
 |--------------------------------------------------------------------------
-| Bootstrap dependencies
+| Register composer
 |--------------------------------------------------------------------------
 |
-| We use a custom bootstrap autoloader to load some October dependencies
-| first, before bringing in all dependencies from Composer.
+| Composer provides a generated class loader for the application.
 |
 */
 
@@ -22,13 +19,10 @@ require __DIR__.'/bootstrap/autoload.php';
 
 /*
 |--------------------------------------------------------------------------
-| Turn On The Lights
+| Load framework
 |--------------------------------------------------------------------------
 |
-| We need to illuminate PHP development, so let us turn on the lights.
-| This bootstraps the framework and gets it ready for use, then it
-| will load up this application so that we can run it and send
-| the responses back to the browser and delight our users.
+| This bootstraps the framework and loads up this application.
 |
 */
 
@@ -36,13 +30,10 @@ $app = require_once __DIR__.'/bootstrap/app.php';
 
 /*
 |--------------------------------------------------------------------------
-| Run The Application
+| Process request
 |--------------------------------------------------------------------------
 |
-| Once we have the application, we can handle the incoming request
-| through the kernel, and send the associated response back to
-| the client's browser allowing them to enjoy the creative
-| and wonderful application we have prepared for them.
+| Execute the request and send the response back to the client.
 |
 */
 
diff --git a/phpunit.xml.dist b/phpunit.xml
similarity index 76%
rename from phpunit.xml.dist
rename to phpunit.xml
index 580890228..de01655c0 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    backupGlobals="false"
-    backupStaticAttributes="false"
-    bootstrap="tests/bootstrap.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="tests/bootstrap.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
 >
     <testsuites>
         <testsuite name="October CMS Test Suite">
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 3de4e0dc9..5ed3e1296 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,4 +1,10 @@
 <?php
+
+/*
+ * October autoloader
+ */
+require __DIR__ . '/../bootstrap/autoload.php';
+
 /*
  * Fallback autoloader
  */