diff --git a/self_compilation.sh b/self_compilation.sh
index ba4ac89..e29d30a 100644
--- a/self_compilation.sh
+++ b/self_compilation.sh
@@ -9,7 +9,7 @@ mount -o remount,rw /boot
 
 # Set Kernel Version (KVER)
 function set_kver() {
-    echo "Enter the kernel version to use (e.g., '6.6.25-hardened1'):"
+    echo "Enter the kernel version to use (e.g., '6.6.18-hardened1'):"
     while true; do
         read -e -i "${KVER:-}" -p "" KVER
         if [[ $(echo $KVER | grep -E '^[0-9]+\.[0-9]+\.[0-9]+(-hardened1)$') == '' ]]; then
@@ -28,7 +28,7 @@ function check_distro(){
     case "${distroId,,}" in
         *void*)
             printf '%s\n' "Detected Void Linux..."
-            xbps-install -Sy make gcc xz elfutils elfutils-devel flex ncurses-devel openssl openssl-devel argp-standalone gcc-ada mpc libmpc-devel gmp-devel perl zstd bc pahole linux-lts-headers
+            xbps-install -Sy make gcc xz elfutils elfutils-devel flex ncurses-devel openssl openssl-devel argp-standalone gcc-ada mpc libmpc-devel gmp-devel perl zstd
             return 0
           ;;
         *debian*|*ubuntu*)
@@ -38,8 +38,7 @@ function check_distro(){
           ;;
         *fedora*|*redhat*)
             printf '%s\n' "Detected RHEL-based Distribution..."
-            sudo dnf install binutils /usr/include/{libelf.h,openssl/pkcs7.h} \ 
-            /usr/bin/{bc,bison,flex,gcc,git,openssl,make,perl,pahole,zstd}
+            sudo dnf install binutils elfutils-libelf-devel openssl-devel bc bison flex gcc git openssl make perl dwarves zstd 
             return 0
           ;;
          *)
@@ -54,11 +53,11 @@ check_distro
 # Staging w/ error handling
 # Pull down Anthraxx linux-hardened upstream
 if [[ ! -f /usr/src/"$KVER".tar.gz ]]; then
-	/usr/bin/curl --verbose --tlsv1.3 --proto =https -L -O --url "https://github.com/anthraxx/linux-hardened/archive/refs/tags/$KVER.tar.gz"
+        /usr/bin/curl --verbose --tlsv1.3 --proto =https -L -O --url "https://github.com/anthraxx/linux-hardened/archive/refs/tags/v$KVER.tar.gz"
 fi
 
 if [[ ! -d /usr/src/linux-hardened-"$KVER" ]]; then
-	tar -xf "$KVER".tar.gz -C /usr/src/
+        tar -xf v"$KVER".tar.gz -C /usr/src/
 fi
 
 # Move to staging directory
@@ -82,7 +81,7 @@ fi
 
 # Prompt if baseline Plague kernel is desired
 ## If not, proceed to fingerprint device
-read -p "Do you want create a custom kernel tailored to your hardware? (y/n): " response
+read -p "Do you want create a custom kernel tailored to your hardware? (y/n)" response
 response=$(echo $response | tr '[:upper:]' '[:lower:]')
 if [[ $response == "y" ]]; then
     echo "Tailoring kernel configuration to your hardware"
@@ -91,7 +90,7 @@ else
     echo "Using baseline Plague kernel configuration"
 fi
 
-read -p "Do you want to open the kernel configuration editor? (y/n): " response
+read -p "Do you want to open the kernel configuration editor? (y/n)" response
 response=$(echo $response | tr '[:upper:]' '[:lower:]')
 if [[ $response == "y" ]]; then
     make menuconfig
@@ -103,20 +102,18 @@ fi
 make -j $(nproc --all)
 make modules_install INSTALL_MOD_STRIP=1 install
 
-function install_kernel() {
-declare -r distroId="$(awk -F= '$1=="ID"{print $NF}' /etc/os-release)"
 case "${distroId,,}" in
         *void*)
             cp ./arch/x86_64/boot/bzImage /boot/vmlinuz-"$KVER"
-	    dracut --kver "$KVER" --force
-	    grub-mkconfig -o /boot/grub/grub.cfg
-	    xbps-reconfigure -fa
-	    /usr/bin/update-grub            
+                dracut --kver "$KVER" --force
+                grub-mkconfig -o /boot/grub/grub.cfg
+                xbps-reconfigure -fa
+                /usr/bin/update-grub            
             return 0
           ;;
         *debian*|*ubuntu*)
             cp ./arch/x86_64/boot/bzImage /boot/vmlinuz-"$KVER"
-	    dracut --kver "$KVER" --force
+                dracut --kver "$KVER" --force
             update-grub2
             return 0
           ;;
@@ -128,23 +125,21 @@ case "${distroId,,}" in
              printf '%s\n' "Unable to detect Operating System!" >&2
              return 1
            ;;
-esac
-}
-
-install_kernel
-
+    esac
 
 
 # Remove sysmap/signing keys
-rm /usr/src/linux-hardened-"$KVER"/certs/signing_key*
-rm /usr/src/linux-hardened-"$KVER"/System.map
-
+rm /lib/modules/"$KVER"/source/certs/signing_key*
+rm /lib/modules/"$KVER"/source/System.map
+rm /lib/modules/"$KVER"/source
+rm /lib/modules/"$KVER"/build
 
 echo "Congrats! Your custom kernel based on the PlagueOS kernel configuration has been installed."
-read -p "Reboot now? (y/N): " response
-response=$(echo $response | tr '[:upper:]' '[:lower:]')
-if [[ $response == "y" ]]; then
-    reboot
+echo "Reboot now? (y/N): "
+read reboot_opt
+
+if [[ "$reboot_opt" == "Y" ]]; then
+        reboot
 else
-    echo "Exiting..."
-fi
\ No newline at end of file
+        exit
+fi