diff --git a/footer b/footer
index 8b67636..9fdcb64 100644
--- a/footer
+++ b/footer
@@ -1,4 +1,4 @@
-# Live usage report:      https://scitas-data.epfl.ch/live        #
-# Maintenance schedule:   https://go.epfl.ch/scitas-down          #
-# Usage statistics:       https://go.epfl.ch/scitas-stats         #
-# Need Help? Questions? Comments?            mailto: 1234@epfl.ch #
+# Live usage report:    https://scitas-data.epfl.ch/live  #
+# Maintenance schedule: https://go.epfl.ch/scitas-down    #
+# Usage statistics:     https://go.epfl.ch/scitas-stats   #
+# Need Help? Questions? Comments?     mailto:1234@epfl.ch #
diff --git a/header b/header
index f4d387b..a42e50a 100644
--- a/header
+++ b/header
@@ -1 +1 @@
-# Welcome to this SCITAS machine:  https://scitas.epfl.ch         #
+# Welcome to this SCITAS machine:  https://scitas.epfl.ch #
diff --git a/header.deneb b/header.deneb
index 57717d9..2d0e9e1 100644
--- a/header.deneb
+++ b/header.deneb
@@ -1 +1 @@
-# Welcome to DENEB: https://scitas.epfl.ch/hardware/deneb         #
+# Welcome to DENEB: https://scitas.epfl.ch/hardware/deneb #
diff --git a/header.fidis b/header.fidis
index 0f61a7d..cdf71f3 100644
--- a/header.fidis
+++ b/header.fidis
@@ -1 +1 @@
-# Welcome to FIDIS: https://scitas.epfl.ch/hardware/fidis         #
+# Welcome to FIDIS: https://scitas.epfl.ch/hardware/fidis #
diff --git a/header.helvetios b/header.helvetios
deleted file mode 100644
index 89afe50..0000000
--- a/header.helvetios
+++ /dev/null
@@ -1 +0,0 @@
-# Welcome to HELVETIOS: https://scitas.epfl.ch/hardware/helvetios #
diff --git a/software-announce b/software-announce
index a339c41..f6fe249 100644
--- a/software-announce
+++ b/software-announce
@@ -1,7 +1,7 @@
-# Welcome to this SCITAS machine:  https://scitas.epfl.ch         #
-# Software announcements:                                         #
-#                                                                 #
-# Feb-2019: ncview 2.1.7, comsol 5.4 and chip-seq 1.5.5 are       #
-#           available on all clusters                             #
-# Mar-2019: parallel 20190222 is available on all clusters        #
-#                                                                 #
+# Software announcements:                                 #
+#                                                         #
+# Feb-2019: ncview 2.1.7, comsol 5.4, and chip-seq 1.5.5  #
+#           are available on all clusters                 #
+# Mar-2019: parallel 20190222 is available on all         #
+#           clusters                                      #
+#                                                         #
diff --git a/system-announce b/system-announce
index c22ec76..65f6962 100644
--- a/system-announce
+++ b/system-announce
@@ -1,2 +1,2 @@
-# System announcements:                                           #
-#                                                                 #
+# System announcements:                                   #
+#                                                         #