diff --git a/bin/basestrap.in b/bin/basestrap.in
index ca6f41d..27b37b7 100644
--- a/bin/basestrap.in
+++ b/bin/basestrap.in
@@ -55,11 +55,11 @@ opts=':C:cdGiM'
 
 while getopts ${opts} arg; do
     case "${arg}" in
+        c) hostcache=true ;;
         C) pacman_config=$OPTARG ;;
         d) directory=true ;;
-        c) hostcache=true ;;
-        i) interactive=true ;;
         G) copykeyring=false ;;
+        i) interactive=true ;;
         M) copymirrorlist=false ;;
         :) echo "invalid argument ${arg}:$OPTARG"; usage 1;;
         ?) usage 0 ;;
diff --git a/bin/buildiso.in b/bin/buildiso.in
index 0349e9d..7718794 100644
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -138,7 +138,6 @@ while getopts "${opts}" arg; do
         c) clean_first=false ;;
         f) full_iso=true ;;
         g) gpgkey="$OPTARG" ;;
-        h|?) usage 0 ;;
         k) kernel="$OPTARG" ;;
         m) persist=true ;;
         p) build_list_iso="$OPTARG" ;;
@@ -148,6 +147,7 @@ while getopts "${opts}" arg; do
         v) verbose=true ;;
         x) images_only=true ;;
         z) iso_only=true ;;
+        h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
diff --git a/bin/buildpkg.in b/bin/buildpkg.in
index efd5535..bdae72b 100644
--- a/bin/buildpkg.in
+++ b/bin/buildpkg.in
@@ -109,7 +109,6 @@ while getopts "${opts}" arg; do
         a) target_arch="$OPTARG" ;;
         b) target_branch="$OPTARG" ;;
         c) clean_first=true ;;
-        h|?) usage 0 ;;
         i) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I ${install_pkgs[*]}) ;;
         n) namcap=true; mkchrootpkg_args+=(-n) ;;
         p) build_list_pkg="${OPTARG%/}" ;;
@@ -117,6 +116,7 @@ while getopts "${opts}" arg; do
         r) chroots_pkg="$OPTARG" ;;
         s) sign=true ;;
         w) wipe_clean=true ;;
+        h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
diff --git a/bin/buildtree.in b/bin/buildtree.in
index d36701e..4c1aad6 100644
--- a/bin/buildtree.in
+++ b/bin/buildtree.in
@@ -61,10 +61,10 @@ opts='sacqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        s) sync=true ;;
         a) abs=true ;;
         c) clean=true ;;
         q) pretend=true ;;
+        s) sync=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
diff --git a/bin/check-yaml.in b/bin/check-yaml.in
index c5c41c7..fdd7cc8 100644
--- a/bin/check-yaml.in
+++ b/bin/check-yaml.in
@@ -113,11 +113,11 @@ while getopts "${opts}" arg; do
         a) target_arch="$OPTARG" ;;
         c) calamares=true ;;
         g) group=true ;;
-        h|?) usage 0 ;;
         k) kernel="$OPTARG" ;;
         p) build_list_iso="$OPTARG" ;;
         q) pretend=true ;;
         v) validate=true ;;
+        h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
 done
diff --git a/bin/deployiso.in b/bin/deployiso.in
index 100f3e7..ba8d924 100644
--- a/bin/deployiso.in
+++ b/bin/deployiso.in
@@ -91,12 +91,12 @@ opts='p:l:uvtqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-                p) build_list_iso="$OPTARG" ;;
-                l) limit="$OPTARG" ;;
-                u) update=true; rsync_args+=(-u) ;;
-                t) torrent=true ;;
-                v) verbose=true; rsync_args+=(-v --stats) ;;
+        l) limit="$OPTARG" ;;
+        p) build_list_iso="$OPTARG" ;;
         q) pretend=true; rsync_args+=(-n) ;;
+        t) torrent=true ;;
+        u) update=true; rsync_args+=(-u) ;;
+        v) verbose=true; rsync_args+=(-v --stats) ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
diff --git a/bin/manjaro-chroot.in b/bin/manjaro-chroot.in
index f2baaf2..922bdc9 100644
--- a/bin/manjaro-chroot.in
+++ b/bin/manjaro-chroot.in
@@ -43,8 +43,8 @@ pretend=false
 usage() {
     echo "usage: ${0##*/} -a [or] ${0##*/} chroot-dir [command]"
     echo '    -a             Automount detected linux system'
-    echo '    -q             Query settings and pretend'
     echo '    -h             Print this help message'
+    echo '    -q             Query settings and pretend'
     echo ''
     echo "    If 'command' is unspecified, ${0##*/} will launch /bin/sh."
     echo ''
diff --git a/lib/util.sh b/lib/util.sh
index dbc7d94..dbce7c3 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -584,8 +584,6 @@ load_pkgs(){
             | sed "$_space" \
             | sed "$_blacklist" \
             | sed "$_purge" \
-            | sed "$_init" \
-            | sed "$_init_rm" \
             | sed "$_arch" \
             | sed "$_arch_rm" \
             | sed "$_nonfree_default" \