diff --git a/deploy.sh b/deploy.sh
index 270b295..1d4a0dd 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -321,14 +321,14 @@ echo \"\${DISK_SIZE[@]}\"
 ### --> Disk selection
   TOTAL_NUMBER_OF_DISKS=${#DISK_NAME[@]}
 
-  if [ "${#DISK_NAME[@]}" -eq 0 ]; then
+  if [ "$TOTAL_NUMBER_OF_DISKS" -eq 0 ]; then
     echo -e "\n\n  ❌ No disks found on the target host. Aborting."
     exit 1
   fi
 
   HEADER=$(printf "    %-12s %-12s %-12s %-12s %s" "Device" "Type" "Size" "SMART" "Path")
 
-  for i in $(seq 0 $((${#DISK_NAME[@]} - 1))); do
+  for i in $(seq 0 $(($TOTAL_NUMBER_OF_DISKS - 1))); do
       GUM_PRINTED_ELEMENT=$(printf "%-12s %-12s %-12s %-12s %s" \
           "${DISK_NAME[$i]}" "${DISK_TYPE[$i]}" "${DISK_SIZE[$i]}" \
           "${DISK_HEALTH[$i]}" "${DISK_DEVPATH[$i]}")
@@ -339,11 +339,10 @@ echo \"\${DISK_SIZE[@]}\"
 
   SELECTED_BOOT_DISK=$(gum choose --limit 2 --header "$HEADER" "${GUM_PRINTED_ELEMENTS[@]}")
 
-NUMBER_OF_BOOT_DISKS="0"
-  for i in $(seq 0 $((${#DISK_NAME[@]} - 1))); do
+  for i in $(seq 0 $(($TOTAL_NUMBER_OF_DISKS - 1))); do
     if printf '%s' "$SELECTED_BOOT_DISK" | grep -iq "${DISK_NAME[$i]}"; then
       ((NUMBER_OF_BOOT_DISKS++))
-      export declare "BOOT_DISK_${NUMBER_OF_BOOT_DISKS}_ID=${DISK_ID[$i]}"
+      export "BOOT_DISK_${NUMBER_OF_BOOT_DISKS}_ID=${DISK_ID[$i]}"
       unset "GUM_PRINTED_ELEMENTS[${i}]"
     fi
   done
@@ -362,7 +361,7 @@ NUMBER_OF_BOOT_DISKS="0"
 
   SELECTED_DATA_DISK=$(gum choose --limit 9 --header "$HEADER" "${GUM_PRINTED_ELEMENTS[@]}")
 
-  for i in $(seq 0 $((${#DISK_NAME[@]} - 1))); do
+  for i in $(seq 0 $(($TOTAL_NUMBER_OF_DISKS - 1))); do
     if printf '%s' "$SELECTED_DATA_DISK" | grep -iq "${DISK_NAME[$i]}"; then
       ((NUMBER_OF_DATA_DISKS++))
     fi
@@ -373,7 +372,7 @@ NUMBER_OF_BOOT_DISKS="0"
   elif [[ "$NUMBER_OF_DATA_DISKS" == "1" ]]; then
     echo -e "\n\n  ⚠️  One data disk selected, continuing with striped boot disk configuration."
     echo -e "  Consider using AT LEAST 2 data disks instead to get data protection features on the data disks."
-    for i in $(seq 0 $((${#DISK_NAME[@]} - 1))); do
+    for i in $(seq 0 $(($TOTAL_NUMBER_OF_DISKS - 1))); do
       if printf '%s' "$SELECTED_DATA_DISK" | grep -iq "${DISK_NAME[$i]}"; then
         NUMBER_OF_CONTENT_DISKS="1"
         NUMBER_OF_PARITY_DISKS="0"
@@ -383,7 +382,7 @@ NUMBER_OF_BOOT_DISKS="0"
     done
   elif [[ "$NUMBER_OF_DATA_DISKS" == "2" ]]; then
     NUMBER_OF_CONTENT_DISKS="0"
-    for i in $(seq 0 $((${#DISK_NAME[@]} - 1))); do
+    for i in $(seq 0 $(($TOTAL_NUMBER_OF_DISKS - 1))); do
       if printf '%s' "$SELECTED_DATA_DISK" | grep -iq "${DISK_NAME[$i]}"; then
         if [[ "$NUMBER_OF_CONTENT_DISKS" == "0" ]]; then
           NUMBER_OF_CONTENT_DISKS="1"
@@ -403,7 +402,7 @@ NUMBER_OF_BOOT_DISKS="0"
     k="$NUMBER_OF_CONTENT_DISKS"
     l="1"
     m="1"
-    for i in $(seq 0 $((${#DISK_NAME[@]} - 1))); do
+    for i in $(seq 0 $(($TOTAL_NUMBER_OF_DISKS - 1))); do
       if printf '%s' "$SELECTED_DATA_DISK" | grep -iq "${DISK_NAME[$i]}"; then
         if [[ "$k" -gt 0 ]]; then
           declare "CONTENT_DISK_${l}_ID=${DISK_ID[$i]}"