diff --git a/postfix/files/mapping.j2 b/postfix/files/mapping.j2
index e403ac3..5045b1f 100644
--- a/postfix/files/mapping.j2
+++ b/postfix/files/mapping.j2
@@ -1,19 +1,23 @@
 # Managed by config management
 
-{% if data is mapping -%}
-  {% for key, value in data.iteritems() -%}
-    {# Some settings, like virtual_alias_maps can take multiple values. Handle this case. -#}
-    {% if value is iterable and value is not string -%}
-      {% for item in value -%}
+{%- macro format_value(key, value) %}
+  {#- Some settings, like virtual_alias_maps can take multiple values. Handle this case. -#}
+  {%- if value is iterable and value is not string -%}
+    {%- for item in value %}
 {{ key }}	{{ item }}
-      {% endfor -%}
-    {% else -%}
+    {%- endfor %}
+  {%- else -%}
 {{ key }}	{{ value }}
-    {% endif -%}
-  {% endfor -%}
-{% else -%}
-  {# Some settings need order, handle OrderedDict -#}
-  {% for item in data -%}
-{{ item.keys()[0] }}	{{ item.values()[0] }}
-{% endfor -%}
-{% endif -%}
+  {%- endif -%}
+{%- endmacro %}
+
+{%- if data is mapping %}
+{% for key, value in data.iteritems() %}
+{{ format_value(key, value) }}
+{%- endfor -%}
+{%- else %}
+{#- Some settings need order, handle OrderedDict #}
+{% for item in data %}
+{{ format_value(item.keys()[0], item.values()[0]) }}
+{%- endfor -%}
+{%- endif %}