diff --git a/libexec/sourcezap/commands/sourcezap-teardown b/libexec/sourcezap/commands/sourcezap-teardown
index 1f8fb65..db7c1da 100755
--- a/libexec/sourcezap/commands/sourcezap-teardown
+++ b/libexec/sourcezap/commands/sourcezap-teardown
@@ -15,9 +15,9 @@ user=_sourcezap
 ##
 # main
 if [ "$(id -u)" = "0" ]; then
-    pw userdel  -n "${user}" || true
-    pw groupdel -n "${user}" || true
-    rm -rf /home/"${user}"/  || true
+    pw userdel  -n "${user}"  || true
+    pw groupdel -n "${user}"  || true
+    rm -rf /home/"${user:?}"/ || true
     printok "done"
 else
     printerr "you must be root"
diff --git a/libexec/sourcezap/setup/setup-doas b/libexec/sourcezap/setup/setup-doas
index 40bb3ae..87c2994 100755
--- a/libexec/sourcezap/setup/setup-doas
+++ b/libexec/sourcezap/setup/setup-doas
@@ -16,8 +16,7 @@ sharedir="${localbase}"/share/sourcezap
 # main
 src="${sharedir}"/doas.conf
 dest="${localbase}"/etc/doas.conf
-cat "${src}" |
-while read -r line; do
+while read -r line < "${src}"; do
     if grep -q "${line}" "${dest}"; then
         continue
     fi