diff --git a/bin/build_bootstrap.php b/bin/build_bootstrap.php
index f9fa2af..258fd4d 100755
--- a/bin/build_bootstrap.php
+++ b/bin/build_bootstrap.php
@@ -20,13 +20,13 @@
  * containing all Mustache library classes. This file can then be included in
  * your project, rather than requiring the Mustache Autoloader.
  */
-$baseDir = realpath(dirname(__FILE__).'/..');
+$baseDir = realpath(dirname(__FILE__) . '/..');
 
-require $baseDir.'/src/Mustache/Autoloader.php';
+require $baseDir . '/src/Mustache/Autoloader.php';
 Mustache_Autoloader::register();
 
 // delete the old file
-$file = $baseDir.'/mustache.php';
+$file = $baseDir . '/mustache.php';
 if (file_exists($file)) {
     unlink($file);
 }
@@ -121,9 +121,9 @@ EOS;
             $content .= preg_replace(array('/^\s*<\?php/', '/\?>\s*$/'), '', file_get_contents($r->getFileName()));
         }
 
-        $cache  = $cacheDir.'/'.$name.$extension;
+        $cache  = $cacheDir . '/' . $name . $extension;
         $header = sprintf(self::HEADER, strftime('%Y'));
-        self::writeCacheFile($cache, $header . substr(self::stripComments('<?php '.$content), 5));
+        self::writeCacheFile($cache, $header . substr(self::stripComments('<?php ' . $content), 5));
     }
 
     /**
diff --git a/test/bootstrap.php b/test/bootstrap.php
index 03a119f..99b6fcf 100644
--- a/test/bootstrap.php
+++ b/test/bootstrap.php
@@ -9,8 +9,8 @@
  * file that was distributed with this source code.
  */
 
-require dirname(__FILE__).'/../src/Mustache/Autoloader.php';
+require dirname(__FILE__) . '/../src/Mustache/Autoloader.php';
 Mustache_Autoloader::register();
-Mustache_Autoloader::register(dirname(__FILE__).'/../test');
+Mustache_Autoloader::register(dirname(__FILE__) . '/../test');
 
-require dirname(__FILE__).'/../vendor/yaml/lib/sfYamlParser.php';
+require dirname(__FILE__) . '/../vendor/yaml/lib/sfYamlParser.php';