diff --git a/init b/init
index 073f767..6ed007b 100755
--- a/init
+++ b/init
@@ -38,7 +38,7 @@ search_package () {
         package=$(curl -s "$url" | grep -Po "$regex" | tail -n 1)
     
         # If a package is found
-        if [[ ! -z $package ]]
+        if [[ -n $package ]]
         then
     
             print "$package found"
@@ -46,7 +46,7 @@ search_package () {
             # Build package url
             package_url="$url$package"
 
-            return $package_url
+            return "$package_url"
         fi
     done
 }
@@ -79,7 +79,7 @@ mount -o remount,size=50% /run/archiso/cowspace
 # Get running kernel version
 # https://github.com/archzfs/archzfs/issues/337#issuecomment-624312576
 kernel_version=$(pacman -Qi linux | sed -n 's/^Version\s*: //p')
-kernel_version_fixed=$(sed 's/-/\./' <<< $kernel_version)
+kernel_version_fixed="${kernel_version//-/\.}"
 
 print "Adding archzfs repo"
 
@@ -102,7 +102,7 @@ print "Current kernel version is $kernel_version"
 zfs_utils_package_url=$(search_package "zfs-linux" "$kernel_version_fixed")
 
 # If a package is found
-if [[ ! -z $zfs_utils_package_url ]]
+if [[ -n $zfs_utils_package_url ]]
 then
 
     # Download package
@@ -110,25 +110,31 @@ then
 
     print "Extracting $zfs_linux_package"
 
-    tar xvf $zfs_linux_package -C /tmp/extract
+    tar xvf "$zfs_linux_package" -C /tmp/extract
 
     print "Searching zfs-utils version required"
 
-    zfs_utils_version=$(cat /tmp/extract/.PKGINFO | grep 'depend = zfs-utils' | grep -o '[[:digit:]].*')
+    zfs_utils_version=$(grep 'depend = zfs-utils' /tmp/extract/.PKGINFO | grep -o '[[:digit:]].*')
+
     rm -Rf /tmp/extract
 
     zfs_utils_url=$(search_package "zfs-utils" "$zfs_utils_version")
 
-    print "Installing zfs-utils"
+    if [[ -n $zfs_utils_url ]]
+    then
 
-    pacman -U $zfs_utils_url --noconfirm
-    pacman -U $zfs_linux_package --noconfirm
+        print "Installing zfs-utils"
 
-    print "Loading zfs kernel module"
+        pacman -U "$zfs_utils_url" --noconfirm
+        pacman -U "$zfs_linux_package" --noconfirm
 
-    # Load kernel module
-    modprobe zfs && print "ZFS module is working"
+        print "Loading zfs kernel module"
 
+        # Load kernel module
+        modprobe zfs && print "ZFS module is working"
+    else
+        print "No module found for current kernel version on Archzfs repos"
+    fi
 else
     print "No module found for current kernel version on Archzfs repos"
 fi