diff --git a/roles/inspircd/templates/etc/inspircd/inspircd.conf.j2 b/roles/inspircd/templates/etc/inspircd/inspircd.conf.j2
index d5f57a7..302fee9 100644
--- a/roles/inspircd/templates/etc/inspircd/inspircd.conf.j2
+++ b/roles/inspircd/templates/etc/inspircd/inspircd.conf.j2
@@ -98,15 +98,34 @@
 
 {% for bind in inspircd_bind %}
 <bind
-    {% if 'address' in bind %}address="{{ bind.address }}"{% endif %}
-    {% if 'port' in bind %}port="{{ bind.port }}"{% endif %}
-    {% if 'defer' in bind %}defer="{{ bind.defer }}"{% endif %}
-    {% if 'free' in bind %}free="{{ bind.free | ternary('yes', 'no') }}"{% endif %}
-    {% if 'path' in bind %}path="{{ path.cafile }}"{% endif %}
-    {% if 'permissions' in bind %}permissions="{{ bind.permissions }}"{% endif %}
-    {% if 'replace' in bind %}replace="{{ bind.replace | ternary('yes', 'no') }}"{% endif %}
-    {% if 'type' in bind %}type="{{ bind.type }}"{% endif %}
-    {% if 'ssl' in bind %}ssl="{{ bind.ssl }}"{% endif %}>
+{% if 'address' in bind %}
+    address="{{ bind.address }}"
+{% endif %}
+{% if 'port' in bind %}
+    port="{{ bind.port }}"
+{% endif %}
+{% if 'defer' in bind %}
+    defer="{{ bind.defer }}"
+{% endif %}
+{% if 'free' in bind %}
+    free="{{ bind.free | ternary('yes', 'no') }}"
+{% endif %}
+{% if 'path' in bind %}
+    path="{{ path.cafile }}"
+{% endif %}
+{% if 'permissions' in bind %}
+    permissions="{{ bind.permissions }}"
+{% endif %}
+{% if 'replace' in bind %}
+    replace="{{ bind.replace | ternary('yes', 'no') }}"
+{% endif %}
+{% if 'type' in bind %}
+    type="{{ bind.type }}"
+{% endif %}
+{% if 'ssl' in bind %}
+    ssl="{{ bind.ssl }}"
+{% endif %}
+>
 
 {% endfor %}
 
@@ -130,20 +149,38 @@
     allowmask="{{ link.allowmask | join(' ') }}"
     sendpass="{{ link.sendpass }}"
     recvpass="{{ link.recvpass }}"
-    {% if 'bind' in link %}bind="{{ link.bind }}"{% endif %}
-    {% if 'fingerprint' in link %}fingerprint="{{ link.fingerprint }}"{% endif %}
-    {% if 'hidden' in link %}hidden="{{ link.hidden | ternary('yes', 'no') }}"{% endif %}
-    {% if 'port' in link %}port="{{ link.port }}"{% endif %}
-    {% if 'ssl' in link %}ssl="{{ link.ssl }}"{% endif %}
-    {% if 'statshidden' in link %}statshidden="{{ link.statshidden | ternary('yes', 'no') }}"{% endif %}
-    {% if 'timeout' in link %}timeout="{{ link.timeout }}"{% endif %}>
+{% if 'bind' in link %}
+    bind="{{ link.bind }}"
+{% endif %}
+{% if 'fingerprint' in link %}
+    fingerprint="{{ link.fingerprint }}"
+{% endif %}
+{% if 'hidden' in link %}
+    hidden="{{ link.hidden | ternary('yes', 'no') }}"
+{% endif %}
+{% if 'port' in link %}
+    port="{{ link.port }}"
+{% endif %}
+{% if 'ssl' in link %}
+    ssl="{{ link.ssl }}"
+{% endif %}
+{% if 'statshidden' in link %}
+    statshidden="{{ link.statshidden | ternary('yes', 'no') }}"
+{% endif %}
+{% if 'timeout' in link %}
+    timeout="{{ link.timeout }}"
+{% endif %}
+>
 {% endif %}
 {% endfor %}
 
 {% for uline in inspircd_ulines %}
 <uline
     server="{{ uline.server }}"
-    {% if 'silent' in uline %}silent="{{ uline.silent | ternary('yes', 'no') }}"{% endif %}>
+{% if 'silent' in uline %}
+    silent="{{ uline.silent | ternary('yes', 'no') }}"
+{% endif %}
+>
 {% endfor %}
 {% endif %}
 
@@ -160,20 +197,38 @@
 {% for name, cls in inspircd_oper_classes.items() %}
 <class
     name="{{ name }}"
-    {% if 'commands' in cls %}commands="{{ cls.commands | join(' ') }}"{% endif %}
-    {% if 'privs' in cls %}privs="{{ cls.privs | join(' ') }}"{% endif %}
-    {% if 'chanmodes' in cls %}chanmodes="{{ cls.chanmodes }}"{% endif %}
-    {% if 'usermodes' in cls %}usermodes="{{ cls.usermodes }}"{% endif %}
-    {% if 'snomasks' in cls %}snomasks="{{ cls.snomasks }}"{% endif %}>
+{% if 'commands' in cls %}
+    commands="{{ cls.commands | join(' ') }}"
+{% endif %}
+{% if 'privs' in cls %}
+    privs="{{ cls.privs | join(' ') }}"
+{% endif %}
+{% if 'chanmodes' in cls %}
+    chanmodes="{{ cls.chanmodes }}"
+{% endif %}
+{% if 'usermodes' in cls %}
+    usermodes="{{ cls.usermodes }}"
+{% endif %}
+{% if 'snomasks' in cls %}
+    snomasks="{{ cls.snomasks }}"
+{% endif %}
+>
     
 {% endfor %}
 
 {% for name, type in inspircd_oper_types.items() %}
 <type
     name="{{ name }}"
-    {% if 'class' in type %}class="{{ cls.class }}"{% endif %}
-    {% if 'classes' in type %}classes="{{ type.classes | join(' ') }}"{% endif %}
-    {% if 'vhost' in type %}vhost="{{ type.vhost }}"{% endif %}>
+{% if 'class' in type %}
+    class="{{ cls.class }}"
+{% endif %}
+{% if 'classes' in type %}
+    classes="{{ type.classes | join(' ') }}"
+{% endif %}
+{% if 'vhost' in type %}
+    vhost="{{ type.vhost }}"
+{% endif %}
+>
     
 {% endfor %}
 
@@ -183,9 +238,16 @@
     host="{{ oper.host }}"
     password="{{ oper.password }}"
     type="{{ oper.type }}"
-    {% if 'class' in oper %}class="{{ oper.class }}"{% endif %}
-    {% if 'hash' in oper %}hash="{{ oper.hash }}"{% endif %}
-    {% if 'vhost' in oper %}vhost="{{ oper.vhost }}"{% endif %}>
+{% if 'class' in oper %}
+    class="{{ oper.class }}"
+{% endif %}
+{% if 'hash' in oper %}
+    hash="{{ oper.hash }}"
+{% endif %}
+{% if 'vhost' in oper %}
+    vhost="{{ oper.vhost }}"
+{% endif %}
+>
 
 {% endfor %}