diff --git a/defaults/main.yml b/defaults/main.yml
index 6c205c355f4c44c603af1df001b71df3a07ca2fd..ca360533ec9686b3bcd9a4d8f6e83e7d9ed8e0ab 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1 +1 @@
-fluentd_cert_passphrase: ''
+fluentd_cert_passphrase:
diff --git a/tasks/main.yml b/tasks/main.yml
index 338bd21b1823a312dd7c489b4ffa7819802595be..e73b71cdedec2f5bf77298cca27d4a4caa6be15e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,20 +1,22 @@
 ---
 # file: roles/fluentd/tasks/main.yml
 
-- name: "FluentD Role"
-  set_fact: role_fluentd_started=true
-  tags: 'always'
+- name: FluentD Role
+  set_fact:
+    role_fluentd_started: yes
+  tags:
+    - always
 
 - block:
 
-  - name: "Install Plugins"
+  - name: Install Plugins
     command: td-agent-gem install {{ item }}
     with_items:
-      - 'fluent-plugin-elasticsearch'
-      - 'fluent-plugin-elasticsearch-timestamp-check'
-      - 'fluent-plugin-kvp-filter'
+      - fluent-plugin-elasticsearch
+      - fluent-plugin-elasticsearch-timestamp-check
+      - fluent-plugin-kvp-filter
 
-  - name: "Copy SSL Key"
+  - name: Copy SSL Key
     copy:
       src='{{ inventory_dir }}/files/ssl/td-agent/key.pem'
       dest='/etc/ssl/td-agent/key.pem'
@@ -22,4 +24,4 @@
       group='root'
       mode='644'
 
-  when: '"fluentd" not in excluded_roles and inventory_hostname in groups.logserver'
+  when: not excluded_roles or "fluentd" not in excluded_roles and inventory_hostname in groups.logserver