diff --git a/tomcat-multiple-instances/handlers/main.yml b/tomcat-multiple-instances/handlers/main.yml
index 79ca6f3e..b34ac94d 100644
--- a/tomcat-multiple-instances/handlers/main.yml
+++ b/tomcat-multiple-instances/handlers/main.yml
@@ -17,12 +17,12 @@
   ignore_errors: True
 
 - name: enable tomcat instances
-  service: name=tomcat-instance-'{{ item.http_port }}' state=started enabled=yes sleep 20
+  service: name=tomcat-instance-'{{ item.http_port }}' state=started enabled=yes sleep=20
   with_items: tomcat_m_instances
   ignore_errors: True
 
 - name: disable tomcat instances
-  service: name=tomcat-instance-'{{ item.http_port }}' state=stopped enabled=no sleep 20
+  service: name=tomcat-instance-'{{ item.http_port }}' state=stopped enabled=no sleep=20
   with_items: tomcat_m_instances
   ignore_errors: True
 
diff --git a/tomcat-multiple-instances/tasks/main.yml b/tomcat-multiple-instances/tasks/main.yml
index adec3369..35d372a4 100644
--- a/tomcat-multiple-instances/tasks/main.yml
+++ b/tomcat-multiple-instances/tasks/main.yml
@@ -5,9 +5,7 @@
 - name: disable the tomcat main instance
   service: name=tomcat'{{ tomcat_version }}' state=stopped enabled=no
   when: not tomcat_service_enabled
-  tags:
-    - tomcat
-    - tomcat_instances
+  tags: [ 'tomcat', 'tomcat_instances' ]
   
 - name: Create a tomcat user for each instance if needed
   user: name={{ item.user }} home={{ item.user_home }} createhome=false shell={{ item.user_shell }}
@@ -17,9 +15,7 @@
     - item.user != "tomcat{{ tomcat_version }}"
     - item.user_shell is defined
   register: tomcat_first_install
-  tags:
-    - tomcat
-    - tomcat_instances
+  tags: [ 'tomcat', 'tomcat_instances' ]
 
 - name: Create a tomcat user if needed
   user: name={{ tomcat_m_default_user }} home={{ tomcat_m_instances_base_path }} createhome=false shell={{ tomcat_m_default_user_shell }}
@@ -27,9 +23,7 @@
     - tomcat_m_use_default_user
     - tomcat_m_default_user != "tomcat{{ tomcat_version }}"
   register: tomcat_first_install
-  tags:
-    - tomcat
-    - tomcat_instances
+  tags: [ 'tomcat', 'tomcat_instances' ]
 
 - name: Create the instances directory trees
   file: dest={{ item.0.instance_path }}/{{ item[1] }} owner={{ item.0.user }} group={{ item.0.user }} mode=0755 state=directory
@@ -37,41 +31,31 @@
     - tomcat_m_instances
     - [ 'common/classes', 'conf/Catalina/localhost', 'conf/policy.d', 'lib', 'server/classes', 'shared/classes', 'webapps' ]
   register: tomcat_first_install
-  tags:
-    - tomcat
-    - tomcat_instances
+  tags: [ 'tomcat', 'tomcat_instances' ]
 
 - name: Create the instances log dirs
   file: dest={{ tomcat_m_instances_logdir_base }}/{{ item.http_port }} owner={{ item.user }} group={{ item.user }} mode=0755 state=directory
   with_items: tomcat_m_instances
   register: tomcat_first_install
-  tags:
-    - tomcat
-    - tomcat_instances
+  tags: [ 'tomcat', 'tomcat_instances' ]
 
 - name: Create the instances work dirs
   file: dest={{ tomcat_m_cache_base }}/{{ item.http_port }} owner={{ item.user }} group={{ item.user }} mode=0755 state=directory
   with_items: tomcat_m_instances
   register: tomcat_first_install
-  tags:
-    - tomcat
-    - tomcat_instances
+  tags: [ 'tomcat', 'tomcat_instances' ]
 
 - name: Create links to work dir inside the instances directory tree
   file: src={{ tomcat_m_cache_base }}/{{ item.http_port }} dest={{ item.instance_path }}/work state=link
   with_items: tomcat_m_instances
   register: tomcat_first_install
-  tags:
-    - tomcat
-    - tomcat_instances
+  tags: [ 'tomcat', 'tomcat_instances' ]
 
 - name: Create links to log dir inside the instances directory tree
   file: src={{ tomcat_m_instances_logdir_base }}/{{ item.http_port }} dest={{ item.instance_path }}/logs state=link
   with_items: tomcat_m_instances
   register: tomcat_first_install
-  tags:
-    - tomcat
-    - tomcat_instances
+  tags: [ 'tomcat', 'tomcat_instances' ]
 
 - name: Populate the instances conf directory
   copy: src={{ item[1] }} dest={{ item.0.instance_path }}/conf/{{ item[1] }} owner={{ item.0.user }} group={{ item.0.user }} mode=0640
@@ -81,9 +65,7 @@
   register: restart_needed
   notify:
     - tomcat restart instances with changed configs 
-  tags:
-    - tomcat
-    - tomcat_instances
+  tags: [ 'tomcat', 'tomcat_instances' ]
 
 - name: Populate the instances conf/policy.d directory
   copy: src=policy.d/{{ item[1] }} dest={{ item.0.instance_path }}/conf/policy.d/{{ item[1] }} owner={{ item.0.user }} group={{ item.0.user }} mode=0640
@@ -93,9 +75,7 @@
   register: restart_needed
   notify:
     - tomcat restart instances with changed configs 
-  tags:
-    - tomcat
-    - tomcat_instances
+  tags: [ 'tomcat', 'tomcat_instances' ]
 
 - name: Install logging.properties if we do not use log4j for the tomcat logging
   copy: src={{ item[1] }} dest={{ item.0.instance_path }}/conf/{{ item[1] }} owner={{ item.0.user }} group={{ item.0.user }} mode=0640
@@ -108,9 +88,7 @@
   register: restart_needed
   notify:
     - tomcat restart instances with changed configs 
-  tags:
-    - tomcat
-    - tomcat_instances
+  tags: [ 'tomcat', 'tomcat_instances' ]
 
 - name: Install the server.xml conf file
   template: src=tomcat-server.xml.j2 dest={{ item.instance_path }}/conf/server.xml owner={{ item.user }} group={{ item.user }} mode=0640
@@ -123,9 +101,7 @@
 - name: Install the instances startup scripts
   template: src=tomcat-instance.init.j2 dest=/etc/init.d/tomcat-instance-{{ item.http_port }} mode=0755 owner=root group=root
   with_items: tomcat_m_instances
-  tags:
-    - tomcat
-    - tomcat_instances
+  tags: [ 'tomcat', 'tomcat_instances' ]
 
 - name: Install the tomcat instances default file
   template: src=tomcat-default.j2 dest=/etc/default/tomcat-instance-{{ item.http_port }} mode=0640 owner=root group={{ item.user }}