diff --git a/tasks/cleanup.yml b/tasks/cleanup.yml
index 7507a9d33767519868f14b251af6c229ead8c8d6..f08b0eda11d5bdda26cf900ea6d3dac533f3456b 100644
--- a/tasks/cleanup.yml
+++ b/tasks/cleanup.yml
@@ -1,28 +1,28 @@
 ---
 # file: cleanup.yml
 
-- name: "Remove host from known_hosts"
+- name: Remove host from known_hosts
   known_hosts:
     name="{{ item }}"
     state="absent"
   with_items:
-    - '{{ static_ipv4|default(false) }}'
-    - '{{ host }}'
+    - {{ static_ipv4|default(false) }}
+    - {{ host }}
 
-- name: "Remove host from hosts file 1"
+- name: Remove host from hosts file 1
   lineinfile:
     dest=/etc/hosts
     regexp='{{ item }}'
     state=absent
   become: yes
   with_items:
-    - '^{{ static_ipv4|default(false) }} '
+    - ^{{ static_ipv4|default(false) }}
 
-- name: "Remove host from hosts file 2"
+- name: Remove host from hosts file 2
   lineinfile:
     dest=/etc/hosts
     regexp='{{ item }}'
     state=absent
   become: yes
   with_items:
-    - '.* {{ host }}$'
+    - .* {{ host }}$
diff --git a/tasks/ec2/inithost.yml b/tasks/ec2/inithost.yml
index 599419c677696a22ef991d475ff2582c7ad72b8a..48caca96c437d78cba003d912a299de29114491d 100644
--- a/tasks/ec2/inithost.yml
+++ b/tasks/ec2/inithost.yml
@@ -4,9 +4,9 @@
 ---
 # file: ec2/inithost.yml
 
-- name: "Create the new instance"
+- name: Create the new instance
   ec2:
-    instance_tags: '{"Name":"Ansible-Host-{{ host }}","AnsibleHost":"{{ host }}","AnsibleGroups":"{{ initgroups }}"}'
+    instance_tags: {"Name":"Ansible-Host-{{ host }}","AnsibleHost":"{{ host }}","AnsibleGroups":"{{ initgroups }}"}
     assign_public_ip: yes
     group_id: "{{ ec2_group_id }}"
     key_name: "{{ ec2_key_name }}"
@@ -18,7 +18,7 @@
     wait: yes
   register: ec2
 
-- name: "Waiting for the new instance(s) to get up and running"
+- name: Waiting for the new instance(s) to get up and running
   ec2:
     instance_ids: "{{ ec2.instance_ids }}"
     instance_type: "{{ ec2_instance_type }}"
@@ -28,7 +28,7 @@
 
 - block:
 
-  - name: "Associate an elastic IP with the new instance"
+  - name: Associate an elastic IP with the new instance
     ec2_eip:
       device_id: "{{ item }}"
       public_ip: '{{ inithostip }}'
diff --git a/tasks/ec2/inithostip.yml b/tasks/ec2/inithostip.yml
index 7e57143f63979f98cc6de73d949ea4003bcf7c61..f2b75b46200e903f21e7d964e2a87217845f1162 100644
--- a/tasks/ec2/inithostip.yml
+++ b/tasks/ec2/inithostip.yml
@@ -1,13 +1,13 @@
 ---
 # file: ec2/inithostip.yml
 
-- name: "Add new instance(s) to the inventory"
+- name: Add new instance(s) to the inventory
   add_host:
     hostname="{{ host }}"
     static_ipv4="{{ hostip }}"
     groups="{{ initgroups }}"
 
-- name: "Waiting for SSH service becoming available"
+- name: Waiting for SSH service becoming available
   wait_for:
     host="{{ hostip }}"
     port=22
diff --git a/tasks/ec2/removehost.yml b/tasks/ec2/removehost.yml
index 10671e7779ff02f7402900155526c11bd00f8b4a..fd1d0070ca8221b512b1a34a8f486d5f855bcca0 100644
--- a/tasks/ec2/removehost.yml
+++ b/tasks/ec2/removehost.yml
@@ -4,7 +4,7 @@
 ---
 # file: ec2/removehost.yml
 
-- name: "Terminate the instance"
+- name: Terminate the instance
   ec2:
     instance_ids: "{{ ec2_id }}"
     instance_type: "{{ ec2_instance_type }}"
diff --git a/tasks/jiffybox/inithost.yml b/tasks/jiffybox/inithost.yml
index a4ec82d37776fbd95eff560550a5c6f2f26aaa51..ce90e4fe86606b3aa8c2cfa1cffa392f66843171 100644
--- a/tasks/jiffybox/inithost.yml
+++ b/tasks/jiffybox/inithost.yml
@@ -4,5 +4,5 @@
 ---
 # file: jiffybox/inithost.yml
 
-- name: "No cloud action required"
+- name: No cloud action required
   debug: msg="IGNORE inithost"
diff --git a/tasks/jiffybox/inithostip.yml b/tasks/jiffybox/inithostip.yml
index d2fadfc5436853b11a54f6c72aa255736e0382ab..dc57e9e4dd23c274e639ac6570f265d9e2010c8d 100644
--- a/tasks/jiffybox/inithostip.yml
+++ b/tasks/jiffybox/inithostip.yml
@@ -4,5 +4,5 @@
 ---
 # file: jiffybox/inithostip.yml
 
-- name: "No cloud action required"
+- name: No cloud action required
   debug: msg="IGNORE inithostip"
diff --git a/tasks/jiffybox/removehost.yml b/tasks/jiffybox/removehost.yml
index a8dc7a1cd85281878a036decc911dc0b5c3ee1b8..914a40f75c61ae9eacc2aea936867a704442718c 100644
--- a/tasks/jiffybox/removehost.yml
+++ b/tasks/jiffybox/removehost.yml
@@ -4,5 +4,5 @@
 ---
 # file: jiffybox/removehost.yml
 
-- name: "No cloud action required"
+- name: No cloud action required
   debug: msg="IGNORE removehost"
diff --git a/tasks/linode/inithost.yml b/tasks/linode/inithost.yml
index 36f5e27e0af7ef7369b6ad699dc9cee02640d8bf..32417c242cd206930bdba5b6a9343f93a8997f82 100644
--- a/tasks/linode/inithost.yml
+++ b/tasks/linode/inithost.yml
@@ -4,5 +4,5 @@
 ---
 # file: linode/inithost.yml
 
-- name: "No cloud action required"
+- name: No cloud action required
   debug: msg="IGNORE inithost"
diff --git a/tasks/linode/inithostip.yml b/tasks/linode/inithostip.yml
index 8cd6c3f7540182ebb87408d5d78c028fb3b8f81e..01ea4b0b68716ce16eb03d420b6c890efa6518aa 100644
--- a/tasks/linode/inithostip.yml
+++ b/tasks/linode/inithostip.yml
@@ -4,5 +4,5 @@
 ---
 # file: linode/inithostip.yml
 
-- name: "No cloud action required"
+- name: No cloud action required
   debug: msg="IGNORE inithostip"
diff --git a/tasks/linode/removehost.yml b/tasks/linode/removehost.yml
index fed00617999d2a8191a232ed6565616565961b6c..c471feadf69c1ab29cfb5391e8d85d5256ffb056 100644
--- a/tasks/linode/removehost.yml
+++ b/tasks/linode/removehost.yml
@@ -4,5 +4,5 @@
 ---
 # file: linode/removehost.yml
 
-- name: "No cloud action required"
+- name: No cloud action required
   debug: msg="IGNORE removehost"
diff --git a/tasks/main.yml b/tasks/main.yml
index e1ad6e46bcb1f7dbccfc54aaaa90e8e0f383f2db..1b36010cac40debe7d3205386cecd6b4df6ceaf5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,9 +1,11 @@
 ---
 # file: roles/cloud/tasks/main.yml
 
-- name: "Cloud Role"
-  set_fact: role_cloud_started=true
-  tags: 'always'
+- name: Cloud Role
+  set_fact:
+    role_cloud_started: yes
+  tags:
+    - always
 
 - block:
 
@@ -11,4 +13,4 @@
 
   - import_tasks: "{{ mode }}.yml"
 
-  when: '"cloud" not in excluded_roles'
+  when: not excluded_roles or "cloud" not in excluded_roles
diff --git a/tasks/none/inithost.yml b/tasks/none/inithost.yml
index 897b4f82731cbe7891fdeb0a3e1760700f1e6c88..47e3d4a9e3f06d9540aae02028ef4cd9e99dd252 100644
--- a/tasks/none/inithost.yml
+++ b/tasks/none/inithost.yml
@@ -4,5 +4,5 @@
 ---
 # file: none/inithost.yml
 
-- name: "No cloud action required"
+- name: No cloud action required
   debug: msg="IGNORE inithost"
diff --git a/tasks/none/inithostip.yml b/tasks/none/inithostip.yml
index 628d6902a78808802ba7d5cadcabfe39363da0e8..9debde90accff2acb6a678b3ba6fff3796846115 100644
--- a/tasks/none/inithostip.yml
+++ b/tasks/none/inithostip.yml
@@ -4,5 +4,5 @@
 ---
 # file: none/inithostip.yml
 
-- name: "No cloud action required"
+- name: No cloud action required
   debug: msg="IGNORE inithostip"
diff --git a/tasks/none/removehost.yml b/tasks/none/removehost.yml
index 176680abb7ca42faa42a7a1417e3c876431c9989..a5ae914fbbadfd060b6b123c5a6e76e87583da58 100644
--- a/tasks/none/removehost.yml
+++ b/tasks/none/removehost.yml
@@ -4,5 +4,5 @@
 ---
 # file: none/removehost.yml
 
-- name: "No cloud action required"
+- name: No cloud action required
   debug: msg="IGNORE removehost"