diff --git a/tasks/main.yml b/tasks/main.yml
index 2069a40df4ef328aa27cab06aa904829134c24d5..e3ff6fd34f285f7f62646d086ace921de8a15891 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,35 +5,37 @@
 ---
 # file: roles/gitlab-client/tasks/main.yml
 
-- name: "GitLab Client Role"
-  set_fact: role_gitlab_client_started=true
-  tags: 'always'
+- name: GitLab Client Role
+  set_fact:
+    role_gitlab_client_started: yes
+  tags:
+    - always
 
 - block:
 
-  - name: "Install Python Library"
+  - name: Install Python Library
     pip:
-      name: 'python-gitlab'
-      state: 'present'
+      name: python-gitlab
+      state: present
 
-  - name: "Copy Scripts"
+  - name: Copy Scripts
     copy:
       src: '{{ item }}'
-      dest: '/usr/local/bin/{{ item }}'
-      mode: '0775'
+      dest: /usr/local/bin/{{ item }}
+      mode: 0775
     with_items:
-      - 'gitlab-issue.py'
-      - 'gitlab-merge-request.py'
+      - gitlab-issue.py
+      - gitlab-merge-request.py
 
-  - name: "Configure GitLab Client"
+  - name: Configure GitLab Client
     template:
-      src: 'gitlab.cfg'
-      dest: '~/.gitlab.cfg'
-      mode: '0600'
+      src: gitlab.cfg
+      dest: ~/.gitlab.cfg
+      mode: 0600
     become_user: '{{ item }}'
     with_items: '{{ admins }}'
     when: gitlab_client[item] is defined
 
-  when: '"gitlab-client" not in excluded_roles'
+  when: not excluded_roles or "gitlab-client" not in excluded_roles