diff --git a/src/freedombone-utils-firewall b/src/freedombone-utils-firewall
index a0a505ea0ccd01a1b4e203e6819c5e23a0f99dac..021df7ad9616fa1c9cbf0ecc5f9527325023b2c4 100755
--- a/src/freedombone-utils-firewall
+++ b/src/freedombone-utils-firewall
@@ -54,10 +54,10 @@ function block_firefox_telemetry {
     # Within firefox source code see submit_telemetry_data.py
 
     if ! grep -q 'telemetry.mozilla' /etc/hosts; then
-	echo '127.0.0.1  telemetry.mozilla.org' >> /etc/hosts
-	echo '127.0.0.1  incoming.telemetry.mozilla.org' >> /etc/hosts
+    echo '127.0.0.1  telemetry.mozilla.org' >> /etc/hosts
+    echo '127.0.0.1  incoming.telemetry.mozilla.org' >> /etc/hosts
     fi
-        
+
     if grep -q "$FIREFOX_TELEMETRY_IP" /etc/firewall.conf; then
         return
     fi
@@ -360,32 +360,32 @@ function mesh_firewall {
     FIREWALL_FILENAME="${rootdir}/etc/systemd/system/meshfirewall.service"
     MESH_FIREWALL_SCRIPT=${rootdir}/usr/bin/mesh-firewall
 
-    if ! grep -q 'telemetry.mozilla' ${rootdir}/etc/hosts; then
-	echo '127.0.0.1       telemetry.mozilla.org' >> ${rootdir}/etc/hosts
-	echo '127.0.0.1       incoming.telemetry.mozilla.org' >> ${rootdir}/etc/hosts
-    fi
-
-    if ! grep -q 'facebook' ${rootdir}/etc/hosts; then
-	{ echo '127.0.0.1       www.facebook.com';
-	  echo '127.0.0.1       facebook.com';
-	  echo '127.0.0.1       static.ak.fbcdn.net';
-	  echo '127.0.0.1       www.static.ak.fbcdn.net';
-	  echo '127.0.0.1       login.facebook.com';
-	  echo '127.0.0.1       www.login.facebook.com';
-	  echo '127.0.0.1       fbcdn.net';
-	  echo '127.0.0.1       www.fbcdn.net';
-	  echo '127.0.0.1       fbcdn.com';
-	  echo '127.0.0.1       www.fbcdn.com';
-	  echo '127.0.0.1       static.ak.connect.facebook.com';
-	  echo '127.0.0.1       www.static.ak.connect.facebook.com'; } >> ${rootdir}/etc/hosts	
-    fi
-    
-    if ! grep -q 'google' ${rootdir}/etc/hosts; then
-	{ echo '127.0.0.1       www.google-analytics.com';
-	  echo '127.0.0.1       google-analytics.com';
-	  echo '127.0.0.1       ssl.google-analytics.com'; } >> ${rootdir}/etc/hosts
-    fi    
-    
+    if ! grep -q 'telemetry.mozilla' "${rootdir}/etc/hosts"; then
+    echo '127.0.0.1       telemetry.mozilla.org' >> "${rootdir}/etc/hosts"
+    echo '127.0.0.1       incoming.telemetry.mozilla.org' >> "${rootdir}/etc/hosts"
+    fi
+
+    if ! grep -q 'facebook' "${rootdir}/etc/hosts"; then
+    { echo '127.0.0.1       www.facebook.com';
+      echo '127.0.0.1       facebook.com';
+      echo '127.0.0.1       static.ak.fbcdn.net';
+      echo '127.0.0.1       www.static.ak.fbcdn.net';
+      echo '127.0.0.1       login.facebook.com';
+      echo '127.0.0.1       www.login.facebook.com';
+      echo '127.0.0.1       fbcdn.net';
+      echo '127.0.0.1       www.fbcdn.net';
+      echo '127.0.0.1       fbcdn.com';
+      echo '127.0.0.1       www.fbcdn.com';
+      echo '127.0.0.1       static.ak.connect.facebook.com';
+      echo '127.0.0.1       www.static.ak.connect.facebook.com'; } >> "${rootdir}/etc/hosts"
+    fi
+
+    if ! grep -q 'google' "${rootdir}/etc/hosts"; then
+    { echo '127.0.0.1       www.google-analytics.com';
+      echo '127.0.0.1       google-analytics.com';
+      echo '127.0.0.1       ssl.google-analytics.com'; } >> "${rootdir}/etc/hosts"
+    fi
+
     { echo '#!/bin/bash';
       echo 'iptables -P INPUT ACCEPT';
       echo 'ip6tables -P INPUT ACCEPT';