diff --git a/control/Cookie_Backend.php b/control/Cookie_Backend.php
index bd1c40ec9..3c2b81580 100644
--- a/control/Cookie_Backend.php
+++ b/control/Cookie_Backend.php
@@ -18,7 +18,7 @@ interface Cookie_Backend {
 	 * @param array $cookies The existing cookies to load into the cookie jar
 	 */
 	public function __construct($cookies = array());
-	
+
 	/**
 	 * Set a cookie
 	 *
@@ -31,7 +31,7 @@ interface Cookie_Backend {
 	 * @param boolean $httpOnly Prevent the cookie being accessible by JS
 	 */
 	public function set($name, $value, $expiry = 90, $path = null, $domain = null, $secure = false, $httpOnly = true);
-	
+
 	/**
 	 * Get the cookie value by name
 	 *
@@ -41,7 +41,7 @@ interface Cookie_Backend {
 	 * @return string|null The cookie value or null if unset
 	 */
 	public function get($name, $includeUnsent = true);
-	
+
 	/**
 	 * Get all the cookies
 	 *
@@ -49,7 +49,7 @@ interface Cookie_Backend {
 	 * @return array All the cookies
 	 */
 	public function getAll($includeUnsent = true);
-	
+
 	/**
 	 * Force the expiry of a cookie by name
 	 *
diff --git a/control/Director.php b/control/Director.php
index 1e315318f..2abf9bf30 100644
--- a/control/Director.php
+++ b/control/Director.php
@@ -442,7 +442,7 @@ class Director implements TemplateGlobalProvider {
 		if ($url == '.' || $url == './') {
 			$url = '';
 		}
-		
+
 		if(strpos($url,'/') === false && !$relativeToSiteBase) {
 			//if there's no URL we want to force a trailing slash on the link
 			if (!$url) {
diff --git a/control/FlushRequestFilter.php b/control/FlushRequestFilter.php
index 35541618a..ab7133ffb 100644
--- a/control/FlushRequestFilter.php
+++ b/control/FlushRequestFilter.php
@@ -15,7 +15,7 @@ class FlushRequestFilter implements RequestFilter {
 		}
 
 		return true;
-	}	
+	}
 
 	public function postRequest(SS_HTTPRequest $request, SS_HTTPResponse $response, DataModel $model) {
 		return true;
diff --git a/control/HTTP.php b/control/HTTP.php
index 586ecddef..e53f9db67 100644
--- a/control/HTTP.php
+++ b/control/HTTP.php
@@ -378,7 +378,7 @@ class HTTP {
 				// (http://support.microsoft.com/kb/323308)
 				// Note: this is also fixable by ticking "Do not save encrypted pages to disk" in advanced options.
 				$cacheControlHeaders['max-age'] = 3;
-				
+
 				// Set empty pragma to avoid PHP's session_cache_limiter adding conflicting caching information,
 				// defaulting to "nocache" on most PHP configurations (see http://php.net/session_cache_limiter).
 				// Since it's a deprecated HTTP 1.0 option, all modern HTTP clients and proxies should
diff --git a/control/injector/Injector.php b/control/injector/Injector.php
index dc400c9b5..09fda499c 100644
--- a/control/injector/Injector.php
+++ b/control/injector/Injector.php
@@ -180,11 +180,11 @@ class Injector {
 	 * @var Factory
 	 */
 	protected $objectCreator;
-	
+
 	/**
 	 * Locator for determining Config properties for services
-	 * 
-	 * @var ServiceConfigurationLocator 
+	 *
+	 * @var ServiceConfigurationLocator
 	 */
 	protected $configLocator;
 
diff --git a/control/injector/ServiceConfigurationLocator.php b/control/injector/ServiceConfigurationLocator.php
index d1bd28de4..424267fc6 100644
--- a/control/injector/ServiceConfigurationLocator.php
+++ b/control/injector/ServiceConfigurationLocator.php
@@ -9,11 +9,11 @@
  * @subpackage injector
  */
 class ServiceConfigurationLocator {
-	
-	
+
+
 	/**
 	 * Finds the Injector config for a named service.
-	 * 
+	 *
 	 * @param string $name
 	 * @return mixed
 	 */