diff --git a/src/Mustache/Autoloader.php b/src/Mustache/Autoloader.php
index 04b9e6f..8c8e906 100644
--- a/src/Mustache/Autoloader.php
+++ b/src/Mustache/Autoloader.php
@@ -14,7 +14,6 @@
  */
 class Mustache_Autoloader
 {
-
     private $baseDir;
 
     /**
diff --git a/src/Mustache/Compiler.php b/src/Mustache/Compiler.php
index 06af266..c6fa24d 100644
--- a/src/Mustache/Compiler.php
+++ b/src/Mustache/Compiler.php
@@ -16,7 +16,6 @@
  */
 class Mustache_Compiler
 {
-
     private $sections;
     private $source;
     private $indentNextLine;
diff --git a/src/Mustache/Loader.php b/src/Mustache/Loader.php
index 9378c2c..e75ee3f 100644
--- a/src/Mustache/Loader.php
+++ b/src/Mustache/Loader.php
@@ -14,7 +14,6 @@
  */
 interface Mustache_Loader
 {
-
     /**
      * Load a Template by name.
      *
diff --git a/src/Mustache/Loader/MutableLoader.php b/src/Mustache/Loader/MutableLoader.php
index f59f95d..78901be 100644
--- a/src/Mustache/Loader/MutableLoader.php
+++ b/src/Mustache/Loader/MutableLoader.php
@@ -14,7 +14,6 @@
  */
 interface Mustache_Loader_MutableLoader
 {
-
     /**
      * Set an associative array of Template sources for this loader.
      *
diff --git a/src/Mustache/Loader/StringLoader.php b/src/Mustache/Loader/StringLoader.php
index 5570cda..72d105d 100644
--- a/src/Mustache/Loader/StringLoader.php
+++ b/src/Mustache/Loader/StringLoader.php
@@ -25,7 +25,6 @@
  */
 class Mustache_Loader_StringLoader implements Mustache_Loader
 {
-
     /**
      * Load a Template by source.
      *
diff --git a/src/Mustache/Template.php b/src/Mustache/Template.php
index c9621c8..35d652c 100644
--- a/src/Mustache/Template.php
+++ b/src/Mustache/Template.php
@@ -16,7 +16,6 @@
  */
 abstract class Mustache_Template
 {
-
     /**
      * @var Mustache_Engine
      */
diff --git a/src/Mustache/Tokenizer.php b/src/Mustache/Tokenizer.php
index 4b5a33c..68ec5c1 100644
--- a/src/Mustache/Tokenizer.php
+++ b/src/Mustache/Tokenizer.php
@@ -16,7 +16,6 @@
  */
 class Mustache_Tokenizer
 {
-
     // Finite state machine states
     const IN_TEXT     = 0;
     const IN_TAG_TYPE = 1;
diff --git a/test/Mustache/Test/Cache/FilesystemCacheTest.php b/test/Mustache/Test/Cache/FilesystemCacheTest.php
index 5bfb18c..8256525 100644
--- a/test/Mustache/Test/Cache/FilesystemCacheTest.php
+++ b/test/Mustache/Test/Cache/FilesystemCacheTest.php
@@ -17,7 +17,7 @@ class Mustache_Test_Cache_FilesystemCacheTest extends Mustache_Test_FunctionalTe
     public function testCacheGetNone()
     {
         $key = 'some key';
-        $cache = new Mustache_Cache_FilesystemCache(self::$tempDir);;
+        $cache = new Mustache_Cache_FilesystemCache(self::$tempDir);
         $loaded = $cache->load($key);
 
         $this->assertFalse($loaded);
@@ -27,7 +27,7 @@ class Mustache_Test_Cache_FilesystemCacheTest extends Mustache_Test_FunctionalTe
     {
         $key = 'some key';
         $value = '<?php /* some value */';
-        $cache = new Mustache_Cache_FilesystemCache(self::$tempDir);;
+        $cache = new Mustache_Cache_FilesystemCache(self::$tempDir);
         $cache->cache($key, $value);
         $loaded = $cache->load($key);
 
diff --git a/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php b/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php
index ecc5e23..04fd56d 100644
--- a/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php
+++ b/test/Mustache/Test/FiveThree/Functional/PartialLambdaIndentTest.php
@@ -42,12 +42,12 @@ EOS;
 
         $tpl = $m->loadTemplate($src);
 
-        $data = new Mustache_Test_Functional_ClassWithLambda();
+        $data = new Mustache_Test_FiveThree_Functional_ClassWithLambda();
         $this->assertEquals($expected, $tpl->render($data));
     }
 }
 
-class Mustache_Test_Functional_ClassWithLambda
+class Mustache_Test_FiveThree_Functional_ClassWithLambda
 {
     public function _t()
     {