diff --git a/tools/api-builder/angular.io-package/templates/class.template.html b/tools/api-builder/angular.io-package/templates/class.template.html
index a28fd6e33f..eaf4fc2e5e 100644
--- a/tools/api-builder/angular.io-package/templates/class.template.html
+++ b/tools/api-builder/angular.io-package/templates/class.template.html
@@ -32,11 +32,7 @@ p.location-badge.
     h3.annotation
       pre.prettyprint
         code.
-          @{$ decorator.name $}{$ paramList(decorator.arguments) | indent(8, false) $}
-{% endfor %}
-{%- endif %}
-
-
+          @{$ decorator.name $}{$ paramList(decorator.arguments) | indent(10, false) $}{% endfor %}{% endif %}
 {% if doc.constructorDoc or doc.members.length -%}
 .l-main-section
   h2 Members
diff --git a/tools/api-builder/angular.io-package/templates/directive.template.html b/tools/api-builder/angular.io-package/templates/directive.template.html
index b601056146..9c12b62fdf 100644
--- a/tools/api-builder/angular.io-package/templates/directive.template.html
+++ b/tools/api-builder/angular.io-package/templates/directive.template.html
@@ -5,11 +5,9 @@
 {% block additional -%}
 .l-main-section
   h2 Selectors
-  .l-sub-section
-    {% for selector in doc.directiveOptions.selector.split(',') %}
+  .l-sub-section{% for selector in doc.directiveOptions.selector.split(',') %}
     h3.selector
-      code {$ selector $}
-    {% endfor %}
+      code {$ selector $}{% endfor %}
 
 {% if doc.inputs %}
 .l-main-section
diff --git a/tools/api-builder/angular.io-package/templates/function.template.html b/tools/api-builder/angular.io-package/templates/function.template.html
index 130f579b6f..4901d626d8 100644
--- a/tools/api-builder/angular.io-package/templates/function.template.html
+++ b/tools/api-builder/angular.io-package/templates/function.template.html
@@ -8,7 +8,7 @@ include ../../_util-fns
   h2(class="function export")
     pre.prettyprint
       code.
-        export {$ doc.name $}{$ paramList(doc.parameters) | indent(4, true) | trim $}{$ returnType(doc.returnType) $}
+        export {$ doc.name $}{$ paramList(doc.parameters) | indent(8, true) | trim $}{$ returnType(doc.returnType) $}
 
   p.location-badge.
     exported from {@link {$ doc.moduleDoc.id $} {$doc.moduleDoc.id $} }