diff --git a/roles/core/motd/init.sls b/roles/core/motd/init.sls
--- a/roles/core/motd/init.sls
+++ b/roles/core/motd/init.sls
@@ -21,7 +21,7 @@
         ipv4_address: {{ network['ipv4_address'] }}
         ipv4_gateway: {{ network['ipv4_gateway'] }}
 
-# Fixes T858
+# Fixes T858
 get_rid_of_scaleway_motd:
   file.absent:
     - name: /etc/update-motd.d/50-scw
diff --git a/roles/core/users/init.sls b/roles/core/users/init.sls
--- a/roles/core/users/init.sls
+++ b/roles/core/users/init.sls
@@ -14,9 +14,9 @@
 #
 #   :: Disabled accounts
 #   :: ZFS (before user account creation)
-#   :: Active accounts
+#   :: Active accounts
 #   :: ZFS (after user account creation)
-#   :: Groups
+#   :: Groups
 #   :: SSH keys
 #
 #   -------------------------------------------------------------
diff --git a/roles/paas-docker/containers/notifications.sls b/roles/paas-docker/containers/notifications.sls
--- a/roles/paas-docker/containers/notifications.sls
+++ b/roles/paas-docker/containers/notifications.sls
@@ -15,7 +15,7 @@
 #
 #   Image:          nasqueron/notifications
 #   Description:    Listen to webhooks, fire notifications to
-#                   the broker. Used for CI / IRC notifications.
+#                   the broker. Used for CI / IRC notifications.
 #   Services used:  RabbitMQ broker (white-rabbit)
 #                   Docker volume   (/data/notifications/storage)
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/shellserver/user-session/files/whom-diff.sh b/roles/shellserver/user-session/files/whom-diff.sh
--- a/roles/shellserver/user-session/files/whom-diff.sh
+++ b/roles/shellserver/user-session/files/whom-diff.sh
@@ -40,7 +40,7 @@
 
 #   -------------------------------------------------------------
 #   Default mode
-#   Prints the diff between current `whom` and previous output
+#   Prints the diff between current `whom` and previous output
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 if [ $# -eq 0 ]; then