diff --git a/CloneToDisk.sh b/CloneToDisk.sh
index 5614a38..1e6f8e9 100755
--- a/CloneToDisk.sh
+++ b/CloneToDisk.sh
@@ -25,8 +25,7 @@ ROOT_LV="root"
 SWAP_LV="swap_1"
 VG_PATH="/dev/mapper/PBX--vg-"
 
-GRUB_CMD="export PATH=/usr/sbin:$PATH && update-initramfs -u -k all
- && grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=debian && update-grub"
+GRUB_CMD="export PATH=/usr/sbin:$PATH && update-initramfs -u -k all && grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=debian && update-grub"
 
 for arg in "$@"; do
   case $arg in
@@ -184,7 +183,7 @@ get_partuuid() {
   local target_part="$1"
 
   local part_uuid="$(
-    lsblk -ln -o PATH,PARTUUID $disk_name | awk '$1=="${target_part}" {print $2}'
+    lsblk -ln -o PATH,PARTUUID $disk_name | awk -v target_part="$target_part" '$1==target_part {print $2}'
   )"
 
   printf "$part_uuid"
@@ -210,8 +209,8 @@ mount_chroot() {
 gen_fstab() {
   echo "Generating fstab..."
 
-  local boot_uuid=$(get_partuuid $BOOT_PART)
-  local efi_uuid=$(get_partuuid $BOOT_PART)
+  boot_uuid=$(get_partuuid $BOOT_PART)
+  efi_uuid=$(get_partuuid $EFI_PART)
 
   cp ./fstab_template ${MOUNT_PATH}/etc/fstab