diff --git a/src/Klein/App.php b/src/Klein/App.php
index 71dbca91..3776d584 100644
--- a/src/Klein/App.php
+++ b/src/Klein/App.php
@@ -16,7 +16,7 @@
 use Klein\Exceptions\UnknownServiceException;
 
 /**
- * App 
+ * App
  */
 class App
 {
diff --git a/src/Klein/Exceptions/DispatchHaltedException.php b/src/Klein/Exceptions/DispatchHaltedException.php
index a00def77..bc28d8f2 100644
--- a/src/Klein/Exceptions/DispatchHaltedException.php
+++ b/src/Klein/Exceptions/DispatchHaltedException.php
@@ -72,7 +72,7 @@ public function getNumberOfSkips()
     {
         return $this->number_of_skips;
     }
-    
+
     /**
      * Sets the number of matches to skip on a "next" skip
      *
diff --git a/src/Klein/Exceptions/ValidationException.php b/src/Klein/Exceptions/ValidationException.php
index 0111a79c..3c29f222 100644
--- a/src/Klein/Exceptions/ValidationException.php
+++ b/src/Klein/Exceptions/ValidationException.php
@@ -14,7 +14,7 @@
 use UnexpectedValueException;
 
 /**
- * ValidationException 
+ * ValidationException
  *
  * Exception used for Validation errors
  */
diff --git a/src/Klein/HttpStatus.php b/src/Klein/HttpStatus.php
index 537fc163..8f40b878 100644
--- a/src/Klein/HttpStatus.php
+++ b/src/Klein/HttpStatus.php
@@ -12,7 +12,7 @@
 namespace Klein;
 
 /**
- * HttpStatus 
+ * HttpStatus
  *
  * HTTP status code and message translator
  */
@@ -133,7 +133,7 @@ public function getMessage()
     /**
      * Set the HTTP status code
      *
-     * @param int $code 
+     * @param int $code
      * @return HttpStatus
      */
     public function setCode($code)
@@ -145,7 +145,7 @@ public function setCode($code)
     /**
      * Set the HTTP status message
      *
-     * @param string $message 
+     * @param string $message
      * @return HttpStatus
      */
     public function setMessage($message)
@@ -156,7 +156,7 @@ public function setMessage($message)
 
     /**
      * Get a string representation of our HTTP status
-     * 
+     *
      * @return string
      */
     public function getFormattedString()
@@ -190,7 +190,7 @@ public function __toString()
      * Returns null if no corresponding message was
      * found for the passed in code
      *
-     * @param int $int 
+     * @param int $int
      * @return string|null
      */
     public static function getMessageFromCode($int)
diff --git a/src/Klein/Request.php b/src/Klein/Request.php
index 3747911d..6e03b812 100644
--- a/src/Klein/Request.php
+++ b/src/Klein/Request.php
@@ -427,7 +427,7 @@ public function pathname()
      * $request->method('post') // returns true
      * $request->method('get') // returns false
      * </code>
-     * 
+     *
      * @param string $is				The method to check the current request method against
      * @param boolean $allow_override	Whether or not to allow HTTP method overriding via header or params
      * @return string|boolean
diff --git a/src/Klein/Response.php b/src/Klein/Response.php
index c8446b5d..bfa1f9cb 100644
--- a/src/Klein/Response.php
+++ b/src/Klein/Response.php
@@ -12,7 +12,7 @@
 namespace Klein;
 
 /**
- * Response 
+ * Response
  */
 class Response extends AbstractResponse
 {
diff --git a/src/Klein/ResponseCookie.php b/src/Klein/ResponseCookie.php
index 5e6c5bf8..6f9c2bcb 100644
--- a/src/Klein/ResponseCookie.php
+++ b/src/Klein/ResponseCookie.php
@@ -122,7 +122,7 @@ public function getName()
     {
         return $this->name;
     }
-    
+
     /**
      * Sets the cookie's name
      *
@@ -145,7 +145,7 @@ public function getValue()
     {
         return $this->value;
     }
-    
+
     /**
      * Sets the cookie's value
      *
@@ -172,7 +172,7 @@ public function getExpire()
     {
         return $this->expire;
     }
-    
+
     /**
      * Sets the cookie's expire time
      *
@@ -202,7 +202,7 @@ public function getPath()
     {
         return $this->path;
     }
-    
+
     /**
      * Sets the cookie's path
      *
@@ -229,7 +229,7 @@ public function getDomain()
     {
         return $this->domain;
     }
-    
+
     /**
      * Sets the cookie's domain
      *
@@ -256,7 +256,7 @@ public function getSecure()
     {
         return $this->secure;
     }
-    
+
     /**
      * Sets the cookie's secure only flag
      *
@@ -279,7 +279,7 @@ public function getHttpOnly()
     {
         return $this->http_only;
     }
-    
+
     /**
      * Sets the cookie's HTTP only flag
      *
diff --git a/src/Klein/Route.php b/src/Klein/Route.php
index 6b4cd118..333d807f 100644
--- a/src/Klein/Route.php
+++ b/src/Klein/Route.php
@@ -110,7 +110,7 @@ public function getCallback()
     {
         return $this->callback;
     }
-    
+
     /**
      * Set the callback
      *
@@ -138,7 +138,7 @@ public function getPath()
     {
         return $this->path;
     }
-    
+
     /**
      * Set the path
      *
@@ -161,7 +161,7 @@ public function getMethod()
     {
         return $this->method;
     }
-    
+
     /**
      * Set the method
      *
@@ -190,7 +190,7 @@ public function getCountMatch()
     {
         return $this->count_match;
     }
-    
+
     /**
      * Set the count_match
      *
@@ -213,7 +213,7 @@ public function getName()
     {
         return $this->name;
     }
-    
+
     /**
      * Set the name
      *
diff --git a/src/Klein/ServiceProvider.php b/src/Klein/ServiceProvider.php
index 0f77ff50..7fed6da8 100644
--- a/src/Klein/ServiceProvider.php
+++ b/src/Klein/ServiceProvider.php
@@ -14,7 +14,7 @@
 use Klein\DataCollection\DataCollection;
 
 /**
- * ServiceProvider 
+ * ServiceProvider
  *
  * Service provider class for handling logic extending between
  * a request's data and a response's behavior
diff --git a/tests/Klein/Tests/AbstractKleinTest.php b/tests/Klein/Tests/AbstractKleinTest.php
index 40cbbe2c..c60c336d 100644
--- a/tests/Klein/Tests/AbstractKleinTest.php
+++ b/tests/Klein/Tests/AbstractKleinTest.php
@@ -28,7 +28,7 @@ abstract class AbstractKleinTest extends PHPUnit_Framework_TestCase
     /**
      * The automatically created test Klein instance
      * (for easy testing and less boilerplate)
-     * 
+     *
      * @type Klein
      */
     protected $klein_app;
@@ -37,7 +37,7 @@ abstract class AbstractKleinTest extends PHPUnit_Framework_TestCase
     /**
      * Setup our test
      * (runs before each test)
-     * 
+     *
      * @return void
      */
     protected function setUp()
@@ -70,7 +70,7 @@ protected function dispatchAndReturnOutput($request = null, $response = null)
     /**
      * Runs a callable and asserts that the output from the executed callable
      * matches the passed in expected output
-     * 
+     *
      * @param mixed $expected The expected output
      * @param callable $callback The callable function
      * @param string $message (optional) A message to display if the assertion fails
@@ -95,7 +95,7 @@ protected function assertOutputSame($expected, $callback, $message = '')
 
     /**
      * Loads externally defined routes under the filename's namespace
-     * 
+     *
      * @param Klein $app_context The application context to attach the routes to
      * @return array
      */
diff --git a/tests/Klein/Tests/DataCollection/ResponseCookieDataCollectionTest.php b/tests/Klein/Tests/DataCollection/ResponseCookieDataCollectionTest.php
index 41bad67f..338d4415 100644
--- a/tests/Klein/Tests/DataCollection/ResponseCookieDataCollectionTest.php
+++ b/tests/Klein/Tests/DataCollection/ResponseCookieDataCollectionTest.php
@@ -16,7 +16,7 @@
 use Klein\Tests\AbstractKleinTest;
 
 /**
- * ResponseCookieDataCollectionTest 
+ * ResponseCookieDataCollectionTest
  */
 class ResponseCookieDataCollectionTest extends AbstractKleinTest
 {
diff --git a/tests/Klein/Tests/HttpStatusTest.php b/tests/Klein/Tests/HttpStatusTest.php
index 985232f0..70383c5d 100644
--- a/tests/Klein/Tests/HttpStatusTest.php
+++ b/tests/Klein/Tests/HttpStatusTest.php
@@ -14,7 +14,7 @@
 use Klein\HttpStatus;
 
 /**
- * HttpStatusTests 
+ * HttpStatusTests
  */
 class HttpStatusTests extends AbstractKleinTest
 {
diff --git a/tests/Klein/Tests/KleinTest.php b/tests/Klein/Tests/KleinTest.php
index 5a27c63e..9b3463a1 100644
--- a/tests/Klein/Tests/KleinTest.php
+++ b/tests/Klein/Tests/KleinTest.php
@@ -25,7 +25,7 @@
 use OutOfBoundsException;
 
 /**
- * KleinTest 
+ * KleinTest
  */
 class KleinTest extends AbstractKleinTest
 {
diff --git a/tests/Klein/Tests/Mocks/MockRequestFactory.php b/tests/Klein/Tests/Mocks/MockRequestFactory.php
index 0845c983..d061089e 100644
--- a/tests/Klein/Tests/Mocks/MockRequestFactory.php
+++ b/tests/Klein/Tests/Mocks/MockRequestFactory.php
@@ -14,7 +14,7 @@
 use Klein\Request;
 
 /**
- * MockRequestFactory 
+ * MockRequestFactory
  *
  * Allow for the simple creation of mock requests
  * (great for testing... ;))
diff --git a/tests/Klein/Tests/ResponseTest.php b/tests/Klein/Tests/ResponseTest.php
index 9301260c..59d3b230 100644
--- a/tests/Klein/Tests/ResponseTest.php
+++ b/tests/Klein/Tests/ResponseTest.php
@@ -21,7 +21,7 @@
 use Klein\Tests\Mocks\MockRequestFactory;
 
 /**
- * ResponsesTest 
+ * ResponsesTest
  */
 class ResponsesTest extends AbstractKleinTest
 {
diff --git a/tests/Klein/Tests/ServiceProviderTest.php b/tests/Klein/Tests/ServiceProviderTest.php
index bbf895d4..446b8d05 100644
--- a/tests/Klein/Tests/ServiceProviderTest.php
+++ b/tests/Klein/Tests/ServiceProviderTest.php
@@ -349,7 +349,7 @@ public function testRender()
             'title' => 'about',
             'verb' => 'woot',
         );
- 
+
         $this->klein_app->respond(
             function ($request, $response, $service) use ($test_data) {
                 // Set some data manually
@@ -386,7 +386,7 @@ public function testRenderChunked()
 
         $response = new Response();
         $response->chunk();
- 
+
         $this->klein_app->respond(
             function ($request, $response, $service) use ($test_data) {
                 // Set some data manually
@@ -420,7 +420,7 @@ public function testPartial()
             'title' => 'about',
             'verb' => 'woot',
         );
- 
+
         $this->klein_app->respond(
             function ($request, $response, $service) use ($test_data) {
                 // Set our layout
diff --git a/tests/Klein/Tests/ValidationsTest.php b/tests/Klein/Tests/ValidationsTest.php
index b64cfc9e..30ce6828 100644
--- a/tests/Klein/Tests/ValidationsTest.php
+++ b/tests/Klein/Tests/ValidationsTest.php
@@ -19,7 +19,7 @@
 use Klein\Validator;
 
 /**
- * ValidationsTest 
+ * ValidationsTest
  */
 class ValidationsTest extends AbstractKleinTest
 {