diff --git a/lib/git/status.rb b/lib/git/status.rb
index 0e173620..d59bc777 100644
--- a/lib/git/status.rb
+++ b/lib/git/status.rb
@@ -27,17 +27,22 @@ def untracked
     def pretty
       out = ''
       self.each do |file|
-        out << file.path
-        out << "\n\tsha(r) " + file.sha_repo.to_s + ' ' + file.mode_repo.to_s
-        out << "\n\tsha(i) " + file.sha_index.to_s + ' ' + file.mode_index.to_s
-        out << "\n\ttype   " + file.type.to_s
-        out << "\n\tstage  " + file.stage.to_s
-        out << "\n\tuntrac " + file.untracked.to_s
-        out << "\n"
+        out << pretty_file(file)
       end
       out << "\n"
       out
     end
+
+    def pretty_file(file)
+      <<FILE
+#{file.path}
+\tsha(r) #{file.sha_repo.to_s} #{file.mode_repo.to_s}
+\tsha(i) #{file.sha_index.to_s} #{file.mode_index.to_s}
+\ttype   #{file.type.to_s}
+\tstage  #{file.stage.to_s}
+\tuntrac #{file.untracked.to_s}
+FILE
+    end
     
     # enumerable method
     
diff --git a/tests/test_helper.rb b/tests/test_helper.rb
index 29b143f8..ef739d32 100644
--- a/tests/test_helper.rb
+++ b/tests/test_helper.rb
@@ -24,7 +24,8 @@ def set_file_paths
     @wdir = create_temp_repo(@wdir_dot)
   end
   
-  def teardown
+  teardown
+  def git_teardown
     if @tmp_path
       FileUtils.rm_r(@tmp_path)
     end