diff --git a/lib/liquid/block.rb b/lib/liquid/block.rb
index 6e33ca51..b69b1b41 100644
--- a/lib/liquid/block.rb
+++ b/lib/liquid/block.rb
@@ -58,7 +58,7 @@ module Liquid
     end
 
     def format
-      "{% #{block_name} %}#{@body.format}{% #{block_delimiter} %}"
+      "{% #{raw} %}#{@body.format}{% #{block_delimiter} %}"
     end
 
     protected
diff --git a/lib/liquid/tag.rb b/lib/liquid/tag.rb
index c949b2eb..eb48ae80 100644
--- a/lib/liquid/tag.rb
+++ b/lib/liquid/tag.rb
@@ -24,7 +24,10 @@ module Liquid
     end
 
     def raw
-      "#{@tag_name} #{@markup}"
+      tag = @tag_name.strip
+      markup = @markup.strip
+      tag << " #{markup}" unless markup.empty?
+      tag
     end
 
     def name
@@ -40,11 +43,7 @@ module Liquid
     end
 
     def format
-      tag = @tag_name.strip
-      markup = @markup.strip
-      tag << " #{markup}" unless markup.empty?
-
-      "{% #{tag} %}"
+      "{% #{raw} %}"
     end
   end
 end