diff --git a/classes/Migration.php b/classes/Migration.php
index 181dcfe..48b8d44 100644
--- a/classes/Migration.php
+++ b/classes/Migration.php
@@ -89,7 +89,7 @@ public function execute($sql, $params = NULL, $display = NULL)
 		if ($display === NULL)
 		{
 			$display = str_replace("\n", '↵', $sql);
-			$display = preg_replace("/[\s\t]+/", " ", $display);
+			$display = preg_replace("/[\s]+/", " ", $display);
 			$display = "execute( ".Text::limit_chars($display, 80)." )";
 		}
 		return $this->run_driver($display, __FUNCTION__, $args);
@@ -99,7 +99,7 @@ public function query($sql, $params = NULL)
 	{
 		$args = func_get_args();
 		$display = str_replace("\n", '↵', $sql);
-		$display = preg_replace("/[\s\t]+/", " ", $display);
+		$display = preg_replace("/[\s]+/", " ", $display);
 		$display = Text::limit_chars($display, 60);
 		return $this->run_driver("query( $display )", __FUNCTION__, $args, TRUE);
 	}
diff --git a/classes/Migration/Actions.php b/classes/Migration/Actions.php
index 4a3a89e..666b927 100644
--- a/classes/Migration/Actions.php
+++ b/classes/Migration/Actions.php
@@ -107,7 +107,7 @@ public function drop_table($tables)
 
 				foreach ($table->columns as $name => $field_params)
 				{
-					$fields[] = "\n\t\t\t'$name' => ".self::field_params_to_string($field_params);
+					$fields[] = "\n            '$name' => ".self::field_params_to_string($field_params);
 				}
 
 				foreach($table->options as $name => $option)
@@ -115,7 +115,7 @@ public function drop_table($tables)
 					$options[] = "'$name' => '$option'";
 				}
 
-				$this->down[] = "\$this->create_table('{$table->name()}', array( ".join(',', $fields)." \n\t\t), array( ".join(',', $options)." )); ";
+				$this->down[] = "\$this->create_table('{$table->name()}', array( ".join(',', $fields)." \n        ), array( ".join(',', $options)." )); ";
 			}
 			catch (Migration_Exception $e)
 			{
diff --git a/classes/Migrations.php b/classes/Migrations.php
index 5cf50ec..e1ec710 100644
--- a/classes/Migrations.php
+++ b/classes/Migrations.php
@@ -83,7 +83,7 @@ public function generate_new_migration_file($name, $actions_template = NULL)
 
 	static function indent($action)
 	{
-		return "\t\t$action";
+		return "        $action";
 	}
 
 	/**
diff --git a/templates/migration.tpl b/templates/migration.tpl
index 98fc766..13f78ec 100644
--- a/templates/migration.tpl
+++ b/templates/migration.tpl
@@ -10,15 +10,15 @@
 * add_index($table_name, $index_name, $columns, $index_type = 'normal')
 * remove_index($table_name, $index_name)
 */
-class {class_name} extends Migration {
-
-	public function up()
-	{
+class {class_name} extends Migration
+{
+    public function up()
+    {
 {up}
-	}
-	
-	public function down()
-	{
+    }
+
+    public function down()
+    {
 {down}
-	}
+    }
 }