diff --git a/tasks/main.yml b/tasks/main.yml
index 4ece322236817c9a5255006ad5c9b665ad05db0f..af23077bba42bf5362df18194d248bf7069b5855 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,7 +2,7 @@
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
 
-- name: Correct the machine hostname to "{{ inventory_hostname_short }}"
+- name: Set machine hostname
   hostname: name="{{ inventory_hostname_short | lower | regex_replace('_','') }}"
 
 - name: Debian Update repo and upgrade installed packages
@@ -42,15 +42,17 @@
 
 - name: Remove unecessary files if present
   file:
-    path: "{{ files_to_remove }}"
+    path: "{{ item }}"
     state: absent
   when: ansible_os_family == "Debian"
+  with_items: "{{ files_to_remove }}"
 
 - name: Remove unecessary users if present
   user:
-    name: "{{ users_to_remove }}"
+    name: "{{ item }}"
     remove: true
     state: absent
+  with_items: "{{ users_to_remove }}"
 
 - name: disable dynamic motd news
   lineinfile: