diff --git a/libexec/portzap/commands/portzap-checkout b/libexec/portzap/commands/portzap-checkout
index b67c91e..53066c5 100644
--- a/libexec/portzap/commands/portzap-checkout
+++ b/libexec/portzap/commands/portzap-checkout
@@ -5,8 +5,8 @@ set -e
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/portzap
-gitdir="$1"
-branch="$2"
+gitdir=$1
+branch=$2
 
 ##
 # functions
@@ -16,11 +16,11 @@ gitexec()
 }
 
 printok() {
-    "${libexec}"/utils/printok "$1"
+    "${libexec}"/utils/printok "${1}"
 }
 
 printerr() {
-    "${libexec}"/utils/printerr "$1"
+    "${libexec}"/utils/printerr "${1}"
 }
 
 ##
diff --git a/libexec/portzap/commands/portzap-clone b/libexec/portzap/commands/portzap-clone
index 2715121..222ef5f 100755
--- a/libexec/portzap/commands/portzap-clone
+++ b/libexec/portzap/commands/portzap-clone
@@ -17,11 +17,11 @@ gitexec()
 }
 
 printok() {
-    "${libexec}"/utils/printok "$1"
+    "${libexec}"/utils/printok "${1}"
 }
 
 printerr() {
-    "${libexec}"/utils/printerr "$1"
+    "${libexec}"/utils/printerr "${1}"
 }
 
 ##
diff --git a/libexec/portzap/commands/portzap-install b/libexec/portzap/commands/portzap-install
index 9c433f8..cb34a50 100755
--- a/libexec/portzap/commands/portzap-install
+++ b/libexec/portzap/commands/portzap-install
@@ -55,15 +55,15 @@ perform_install()
 
 run_install()
 {
-    install -o root -g _portzap -m "${mode}" -v "$@"
+    install -o root -g _portzap -m "${mode}" -v "${@}"
 }
 
 printok() {
-    "${libexec}"/utils/printok "$1"
+    "${libexec}"/utils/printok "${1}"
 }
 
 printerr() {
-    "${libexec}"/utils/printerr "$1"
+    "${libexec}"/utils/printerr "${1}"
 }
 
 ##
diff --git a/libexec/portzap/commands/portzap-pull b/libexec/portzap/commands/portzap-pull
index e2df98f..a627b28 100755
--- a/libexec/portzap/commands/portzap-pull
+++ b/libexec/portzap/commands/portzap-pull
@@ -15,11 +15,11 @@ gitexec()
 }
 
 printok() {
-    "${libexec}"/utils/printok "$1"
+    "${libexec}"/utils/printok "${1}"
 }
 
 printerr() {
-    "${libexec}"/utils/printerr "$1"
+    "${libexec}"/utils/printerr "${1}"
 }
 
 ##
diff --git a/libexec/portzap/commands/portzap-rm b/libexec/portzap/commands/portzap-rm
index b8fc488..1836622 100644
--- a/libexec/portzap/commands/portzap-rm
+++ b/libexec/portzap/commands/portzap-rm
@@ -25,7 +25,7 @@ erase()
 }
 
 printerr() {
-    "${libexec}"/utils/printerr "$1"
+    "${libexec}"/utils/printerr "${1}"
 }
 
 ##