diff --git a/handlers/main.yml b/handlers/main.yml
index edb701c054e018ed54e9ec7b6d3013257c180524..6f016c22cb0f9c03c2abfd23252b2bc53326fffe 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -2,6 +2,8 @@
 
 - name: start icinga2
   become: yes
-  service: name=icinga2 state=started enabled=yes
-  when:
-    - i2_manage_service
+  service:
+    name=icinga2
+    state=started
+    enabled=yes
+  when: i2_manage_service
diff --git a/tasks/icinga2-Debian.yml b/tasks/icinga2-Debian.yml
index 19de05b7df050a5f8eea2137efd7205eaa9d7170..2e83fc7ad4d894635d2060b764ed958524349fe8 100644
--- a/tasks/icinga2-Debian.yml
+++ b/tasks/icinga2-Debian.yml
@@ -2,23 +2,31 @@
 
 - name: Debian - Install apt-transport-https
   become: yes
-  apt: name=apt-transport-https state=present
+  apt:
+    name=apt-transport-https
+    state=present
   when: i2_manage_repository
 
 - name: Debian - Add Icinga 2 repository key
   become: yes
-  apt_key: url="{{ i2_apt_key }}" state=present
+  apt_key:
+    url="{{ i2_apt_key }}"
+    state=present
   when: i2_manage_repository and i2_apt_key
 
 - name: Debian - Add Icinga 2 repository
   become: yes
-  apt_repository: repo={{ item.repo }} state={{ item.state}}
+  apt_repository:
+    repo={{ item.repo }}
+    state={{ item.state}}
   with_items:
     - { repo: "{{ i2_apt_url }}", state: "present" }
   when: i2_manage_repository
 
 - name: Debian - Ensure icinga2 is installed
   become: yes
-  apt: name=icinga2 state=present
+  apt:
+    name=icinga2
+    state=present
   notify: start icinga2
   when: i2_manage_package
diff --git a/tasks/icinga2-RedHat.yml b/tasks/icinga2-RedHat.yml
index 405ff41b731644c6756bb3ea76324ee075e53b1f..be90abaff1c44c8f8854478f617e8cbbfc6c1315 100644
--- a/tasks/icinga2-RedHat.yml
+++ b/tasks/icinga2-RedHat.yml
@@ -2,11 +2,15 @@
 
 - name: RedHat - Add Icinga 2 repository
   become: yes
-  template: src=ICINGA-release.repo dest=/etc/yum.repos.d/ICINGA-release.repo
+  template:
+    src=ICINGA-release.repo
+    dest=/etc/yum.repos.d/ICINGA-release.repo
   when: i2_manage_repository
 
 - name: RedHat - Ensure icinga2 is installed
   become: yes
-  yum: name=icinga2 state=present
+  yum:
+    name=icinga2
+    state=present
   notify: start icinga2
   when: i2_manage_package
diff --git a/tasks/main.yml b/tasks/main.yml
index a0a8d0e24d456c038b05355070e600749abc54ba..d2c063822593de9730c3046e5577aca284ad7f05 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,5 +5,8 @@
       - install
 
 - name: Make sure Icinga 2 is started
-  service: name=icinga2 state=started enabled=yes
+  service:
+    name=icinga2
+    state=started
+    enabled=yes
   when: i2_manage_service