diff --git a/handlers/main.yml b/handlers/main.yml
index 6ec428a5baa3eec431c353ea0721683779ccc44f..3b4b3ba2e222930b24d1c2f42e426552b9b4599f 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -6,10 +6,10 @@
 
 - name: Restart NetData
   service:
-    name='netdata'
-    state='restarted'
+    name: netdata
+    state: restarted
 
 - name: Restart Apache
   service:
-    name='apache2'
-    state='restarted'
+    name: apache2
+    state: restarted
diff --git a/tasks/apache.yml b/tasks/apache.yml
index c7814c12c204c7c5a37ee3ee8bf643eb925ee6f7..71f10d065d73b31e7df57215f1b9c33e40ad3787 100644
--- a/tasks/apache.yml
+++ b/tasks/apache.yml
@@ -5,7 +5,8 @@
   apache2_module:
     name: status
     state: present
-  notify: "Restart Apache"
+  notify:
+    - Restart Apache
 
 - name: Apache Status Site
   template:
@@ -14,11 +15,15 @@
     owner: root
     group: root
     mode: 0644
-  notify: "Restart Apache"
+  notify:
+    - Restart Apache
 
 - name: Enable Apache Status Site
-  command: a2ensite status creates=/etc/apache2/sites-enabled/status{{ apache_conf_ext|default('.conf') }}
-  notify: "Restart Apache"
+  command: a2ensite status
+  args:
+    creates: /etc/apache2/sites-enabled/status{{ apache_conf_ext|default('.conf') }}
+  notify:
+    - Restart Apache
 
 - name: Weblog Module Configuration
   template:
diff --git a/tasks/configure.yml b/tasks/configure.yml
index 0613e74387215f3bbe45efc0a3eb5b45f4e295cb..6cc590beddeabd91b2ce6de2150db04ec7a44e1a 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -70,7 +70,8 @@
   when: ansible_lsb.major_release == '12'
 
 - name: Check if KSM is available
-  stat: path='/sys/kernel/mm/ksm'
+  stat:
+    path: /sys/kernel/mm/ksm
   register: ksm
 
 # Note: copy module doesn't work here because parent directory /sys