diff --git a/seb4itik/byow/roles/caddy/defaults/main.yml b/seb4itik/byow/roles/caddy/defaults/main.yml
index a4d2004..8b21429 100644
--- a/seb4itik/byow/roles/caddy/defaults/main.yml
+++ b/seb4itik/byow/roles/caddy/defaults/main.yml
@@ -4,7 +4,7 @@
 caddy_my_name: "mywaf"
 caddy_http_port: 80
 caddy_https_port: 443
-caddy_default_bind: ""
+caddy_default_bind: null
 
 # If true, will not install software, just deploy Caddy and OWASP CRS
 # configuration files.
@@ -21,8 +21,8 @@ caddy_ca_root: null
 
 # For using a Consul cluster.
 caddy_consul: false
-caddy_consul_delegate_to: null         # Required
-caddy_consul_admin_token: null         # Required
+caddy_consul_delegate_to: null         # Required, Consul host for running Consul commands
+caddy_consul_admin_token: null         # Required, generate with "uuidgen"
 caddy_consul_aes_key: null             # Required, 32 characters
 caddy_consul_server: "127.0.0.1:8500"
 # FIXME: SSL connexion doesn't work
diff --git a/seb4itik/byow/roles/caddy/tasks/caddy_consul.yml b/seb4itik/byow/roles/caddy/tasks/caddy_consul.yml
index 2a1c205..c678dbe 100644
--- a/seb4itik/byow/roles/caddy/tasks/caddy_consul.yml
+++ b/seb4itik/byow/roles/caddy/tasks/caddy_consul.yml
@@ -1,4 +1,3 @@
-
 - name: Create consul policy for Caddy TLS and rate limit
   delegate_to: "{{ caddy_consul_delegate_to }}"
   run_once: true
diff --git a/seb4itik/byow/roles/caddy/vars/main.yml b/seb4itik/byow/roles/caddy/vars/main.yml
index 668bb94..b546e34 100644
--- a/seb4itik/byow/roles/caddy/vars/main.yml
+++ b/seb4itik/byow/roles/caddy/vars/main.yml
@@ -58,9 +58,9 @@ caddy_global_sites_defaults:
 
   # CORS - Cross Origin Resource Sharing
   cors: false
-  cors_allowed_origins: []      # Minimum 1 required
+  cors_allowed_origins: []    # Minimum 1 required
   cors_allowed_methods:
-  # These variables can be used for adding and removing extensions from the list:
+  # These variables can be used for adding and removing methods from the list:
   # cors_allowed_methods_add: ["XXX"]
   # cors_allowed_methods_del: ["YYY"]
     - "GET"
@@ -68,7 +68,7 @@ caddy_global_sites_defaults:
     - "POST"
     - "OPTIONS"
   cors_allowed_headers:
-  # These variables can be used for adding and removing extensions from the list:
+  # These variables can be used for adding and removing headers from the list:
   # cors_allowed_headers_add: ["Xxx"]
   # cors_allowed_headers_del: ["Yyy"]
     - "Cache-Control"
@@ -79,12 +79,12 @@ caddy_global_sites_defaults:
   cors_max_age: 3600
   cors_allowed_credentials: false
   cors_vary:
-  # These variables can be used for adding and removing extensions from the list:
+  # These variables can be used for adding and removing headers from the list:
   # cors_vary_add: ["Xxx"]
   # cors_vary_del: ["Yyy"]
     - "Origin"
   cors_exposed_headers:
-  # These variables can be used for adding and removing extensions from the list:
+  # These variables can be used for adding and removing headers from the list:
   # cors_exposed_headers_add: ["Xxx"]
   # cors_exposed_headers_del: ["Yyy"]
     - "Content-Length"
@@ -309,7 +309,7 @@ caddy_global_sites_defaults:
   crs_sampling_percentage: 100
   crs_allow_method_override_parameter: 0
   crs_allowed_methods:
-  # These variables can be used for adding and removing extensions from the list:
+  # These variables can be used for adding and removing methods from the list:
   # crs_allowed_methods_add: ["XXX"]
   # crs_allowed_methods_del: ["YYY"]
     - "GET"
@@ -317,7 +317,7 @@ caddy_global_sites_defaults:
     - "POST"
     - "OPTIONS"
   crs_allowed_request_content_type:
-  # These variables can be used for adding and removing extensions from the list:
+  # These variables can be used for adding and removing content types from the list:
   # crs_allowed_request_content_type_add: ["|xxx/yyy|"]
   # crs_allowed_request_content_type_del: ["|zzz/aaa|"]
     - "|application/json|"
@@ -428,7 +428,7 @@ caddy_global_sites_defaults:
     - ".xsd/"
     - ".xsx/"
   crs_restricted_headers_basic:
-  # These variables can be used for adding and removing extensions from the list:
+  # These variables can be used for adding and removing headers from the list:
   # crs_restricted_headers_basic_add: ["/xxx/"]
   # crs_restricted_headers_basic_del: ["/yyy/"]
     - "/content-encoding/"
@@ -442,12 +442,12 @@ caddy_global_sites_defaults:
     - "/x-method-override/"
     - "/x-middleware-subrequest/"
   crs_restricted_headers_extended:
-  # These variables can be used for adding and removing extensions from the list:
+  # These variables can be used for adding and removing headers from the list:
   # crs_restricted_headers_extended_add: ["/xxx/"]
   # crs_restricted_headers_extended_del: ["/yyy/"]
     - "/accept-charset/"
   crs_allowed_http_versions:
-  # These variables can be used for adding and removing extensions from the list:
+  # These variables can be used for adding and removing protocols from the list:
   # crs_allowed_http_versions_add: ["HTTP/x.x"]
   # crs_allowed_http_versions_del: ["HTTP/y.y"]
     - "HTTP/1.0"
@@ -457,7 +457,7 @@ caddy_global_sites_defaults:
     - "HTTP/3"
     - "HTTP/3.0"
   crs_allowed_request_content_type_charset:
-  # These variables can be used for adding and removing extensions from the list:
+  # These variables can be used for adding and removing charsets from the list:
   # crs_allowed_request_content_type_charset_add: ["|xxx|"]
   # crs_allowed_request_content_type_charset_del: ["|yyy|"]
     - "|utf-8|"