diff --git a/app/models/enterprises_block.rb b/app/models/enterprises_block.rb
index 386f8a7..0be0f4b 100644
--- a/app/models/enterprises_block.rb
+++ b/app/models/enterprises_block.rb
@@ -2,17 +2,16 @@ class EnterprisesBlock < Design::Block
 
   def content
 
-    lambda do
-      content_tag(:ul,
-        Enterprise.find(:all).map do |p|
-          content_tag(:li,
-  	         content_tag(:span,
-              link_to_homepage( p.name, p.identifier)
+      lambda do
+     content_tag(
+              'ul',
+              Enterprise.find(:all).map do |p|
+                content_tag(
+                'li',
+		link_to_homepage(content_tag('span', p.name, :class => 'people_list_block'), p.identifier)
+                )
+              end.join("\n")
             )
-          )
-        end.join("\n"),
-        :class => 'enterprises_list_block' 
-      )
     end
 
   end
diff --git a/app/models/list_block.rb b/app/models/list_block.rb
index bbbfe4e..f6e9670 100644
--- a/app/models/list_block.rb
+++ b/app/models/list_block.rb
@@ -8,12 +8,9 @@ class ListBlock < Design::Block
               Person.find(:all).map do |p|
                 content_tag(
                 'li',
-		content_tag(
-		'span',
-                link_to_homepage( p.name, p.identifier)
-                ))
-              end.join("\n"),
-              :class => 'people_list_block' 
+		link_to_homepage(content_tag('span', p.name, :class => 'people_list_block'), p.identifier)
+                )
+              end.join("\n")
             )
     end
 
--
libgit2 0.21.2