diff --git a/lib/twine/twine_file.rb b/lib/twine/twine_file.rb
index f675f7a..9d0a1e5 100644
--- a/lib/twine/twine_file.rb
+++ b/lib/twine/twine_file.rb
@@ -213,25 +213,34 @@ module Twine
           f.puts "[[#{section.name}]]"
 
           section.definitions.each do |definition|
-            f.puts "\t[#{definition.key}]"
+            f.puts "\n#{space(2)}[#{definition.key}]"
+
+            if definition.raw_comment and definition.raw_comment.length > 0
+              f.puts "#{space(4)}comment = #{definition.raw_comment}"
+            end
+            if definition.tags && definition.tags.length > 0
+              tag_str = definition.tags.join(',')
+              f.puts "#{space(4)}tags = #{tag_str}"
+            end
+            if definition.reference_key
+              f.puts "#{space(4)}ref = #{definition.reference_key}"
+            end
 
             value = write_value(definition, dev_lang, f)
             if !value && !definition.reference_key
               Twine::stdout.puts "WARNING: #{definition.key} does not exist in developer language '#{dev_lang}'"
             end
-            
-            if definition.reference_key
-              f.puts "\t\tref = #{definition.reference_key}"
-            end
-            if definition.tags && definition.tags.length > 0
-              tag_str = definition.tags.join(',')
-              f.puts "\t\ttags = #{tag_str}"
-            end
-            if definition.raw_comment and definition.raw_comment.length > 0
-              f.puts "\t\tcomment = #{definition.raw_comment}"
-            end
+
             @language_codes[1..-1].each do |lang|
-              write_value(definition, lang, f)
+              if lang =~ /^#{dev_lang}/
+                write_value(definition, lang, f)
+              end
+            end
+
+            @language_codes[1..-1].each do |lang|
+              if not lang =~ /^#{dev_lang}/
+                write_value(definition, lang, f)
+              end
             end
           end
         end
@@ -248,9 +257,14 @@ module Twine
         value = '`' + value + '`'
       end
 
-      file.puts "\t\t#{language} = #{value}"
+      file.puts "#{space(4)}#{language} = #{value}"
       return value
     end
 
+    def space(level)
+        ' ' * level
+    end
+
+
   end
 end