diff --git a/defaults/main.yml b/defaults/main.yml
index a229f97214e6a79b59b7936c7330c3aca498a9d1..fbd8ccf4464844e87702a828c8618c59518f8ea6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,7 +2,7 @@
 cloud_url: "owncloud.example.org"
 cloud_pg_user: "owncloud"
 cloud_pg_pass: "notSoSecurePassword"
-cloud_pg_hash: "md53fc414b70561de0f2acb4f3b0985f5cd" # can be obtained with `echo "md5`echo -n 'notSoSecurePassword' | md5sum | awk '{print $1}'`"``
+cloud_pg_hash: "md53fc414b70561de0f2acb4f3b0985f5cd"  # can be obtained with echo "md5`echo -n 'notSoSecurePassword' | md5sum | awk '{print $1}'`"
 cloud_data_dir: "/owncloud"
 
 # E-mail used to generate Let's Encrypt SSL certificate
diff --git a/handlers/main.yml b/handlers/main.yml
index ad3254eaa787328eeca134e8a34052dc2c2475df..82c6f07c09f772aa403f9c6e31f49e8c2121f6d5 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,4 +1,4 @@
 ---
 
 - name: restart nginx
-  service: name=nginx state=restarted 
+  service: name=nginx state=restarted
diff --git a/tasks/main.yml b/tasks/main.yml
index 336b5969328cf66e36134f3bdb1c4f329d64b566..abb462936479d63d467c94d03b62d664cd648a85 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -37,7 +37,7 @@
 
 - name: Creating the Owncloud PostgreSQL User
   postgresql_user:
-    name: {{ cloud_pg_user }}
+    name: "{{ cloud_pg_user }}"
     role_attr_flags: "CREATEDB,NOSUPERUSER,LOGIN"
     password: "{{ cloud_pg_hash }}"
   become: true
@@ -47,7 +47,7 @@
 - name: Creating the Owncloud PostgreSQL DB
   postgresql_db:
     name: owncloud
-    owner: {{ cloud_pg_user }}
+    owner: "{{ cloud_pg_user }}"
   become: true
   become_user: postgres
   tags: owncloud_db
@@ -79,9 +79,9 @@
     job: certbot renew --nginx >> /var/log/le-renew.log
   tags: owncloud_certificate,owncloud_proxy
 
-#--------------------------------------------------
+# --------------------------------------------------
 # NGINX Configuration
-#--------------------------------------------------
+# --------------------------------------------------
 
 - name: Configure Nginx
   template:
@@ -104,9 +104,9 @@
   tags: owncloud_proxy
 
 
-#--------------------------------------------------
+# --------------------------------------------------
 # Backup Configuration
-#--------------------------------------------------
+# --------------------------------------------------
 - name: Backup script
   template:
     src: backup.sh.j2
@@ -126,9 +126,9 @@
   when: inventory_hostname in groups['maintenance_contract']
 
 
-#--------------------------------------------------
+# --------------------------------------------------
 # Permissions
-#--------------------------------------------------
+# --------------------------------------------------
 - name: Set file rights on the ones to be owned by root
   file:
     path: "{{ item }}"
@@ -138,7 +138,7 @@
     recurse: true
     state: directory
   with_items:
-  - /var/www/owncloud/
+    - /var/www/owncloud/
   tags: owncloud_permissions
 
 - name: Set file rights on the ones to be owned by htuser
@@ -150,10 +150,10 @@
     recurse: true
     state: directory
   with_items:
-  - /var/www/owncloud/apps
-  - /var/www/owncloud/config
-  - /var/www/owncloud/updater
-  - "{{ cloud_data_dir }}/"
+    - /var/www/owncloud/apps
+    - /var/www/owncloud/config
+    - /var/www/owncloud/updater
+    - "{{ cloud_data_dir }}/"
   tags: owncloud_permissions
 
 - name: Set execution right on occ
@@ -163,7 +163,7 @@
     group: www-data
     mode: +x
   with_items:
-  - /var/www/owncloud/occ
+    - /var/www/owncloud/occ
   tags: owncloud_permissions
 
 - name: Limit rights on htaccess
@@ -173,7 +173,7 @@
     group: www-data
     mode: '0644'
   with_items:
-  - /var/www/owncloud/.htaccess
-  - "{{ cloud_data_dir }}/.htaccess"
+    - /var/www/owncloud/.htaccess
+    - "{{ cloud_data_dir }}/.htaccess"
   ignore_errors: true
   tags: owncloud_permissions