diff --git a/roles/network/tasks/dansguardian.yml b/roles/network/tasks/dansguardian.yml
index 2d4cebc40..5ef170e52 100644
--- a/roles/network/tasks/dansguardian.yml
+++ b/roles/network/tasks/dansguardian.yml
@@ -1,47 +1,53 @@
 - name: Install DansGuardian packages
-  package: name={{ item }}
-           state=present
+  package:
+    name: "{{ item }}"
+    state: present
   with_items:
     - dansguardian
   tags:
     - download
 
-- name: Copy DansGuardian config file
-  template: src=roles/network/templates/squid/dansguardian.conf.j2
-            dest=/etc/dansguardian/dansguardian.conf
-            owner=dansguardian
-            group=dansguardian
-            mode=0640
+- name: Copy DansGuardian config file (Fedora)
+  template:
+    src: roles/network/templates/squid/dansguardian.conf.j2
+    dest: /etc/dansguardian/dansguardian.conf
+    owner: dansguardian
+    group: dansguardian
+    mode: 0640
   when: ansible_distribution == "Fedora"
 
-- name: Copy DansGuardian config file
-  template: src=roles/network/templates/squid/dansguardian.conf.debian.j2
-            dest=/etc/dansguardian/dansguardian.conf
-            owner=dansguardian
-            group=dansguardian
-            mode=0640
+- name: Copy DansGuardian config file (debuntu)
+  template:
+    src: roles/network/templates/squid/dansguardian.conf.debian.j2
+    dest: /etc/dansguardian/dansguardian.conf
+    owner: dansguardian
+    group: dansguardian
+    mode: 0640
   when: is_debuntu
 
-- name: Copy DansGuardian config file for CentOS
-  template: src=roles/network/templates/squid/dansguardian.conf.centos.j2
-            dest=/etc/dansguardian/dansguardian.conf
-            owner=dansguardian
-            group=vscan
-            mode=0640
+- name: Copy DansGuardian config file (CentOS)
+  template:
+    src: roles/network/templates/squid/dansguardian.conf.centos.j2
+    dest: /etc/dansguardian/dansguardian.conf
+    owner: dansguardian
+    group: vscan
+    mode: 0640
   when: ansible_distribution == "CentOS"
 
-- name: Create 'dansguardian' log directory
-  file: path=/var/log/dansguardian
-        owner=dansguardian
-        group=dansguardian
-        mode=0750
-        state=directory
+- name: Create 'dansguardian' log directory (OS's other than CentOS)
+  file:
+    path: /var/log/dansguardian
+    owner: dansguardian
+    group: dansguardian
+    mode: 0750
+    state: directory
   when: ansible_distribution != "CentOS"
 
-- name: Create DansGuardian log directory for CentOS
-  file: path=/var/log/dansguardian
-        owner=dansguardian
-        group=vscan
-        mode=0750
-        state=directory
+- name: Create DansGuardian log directory (CentOS)
+  file:
+    path: /var/log/dansguardian
+    owner: dansguardian
+    group: vscan
+    mode: 0750
+    state: directory
   when: ansible_distribution == "CentOS"