diff --git a/bank b/bank
index 02f0458..37d7333 100755
--- a/bank
+++ b/bank
@@ -102,8 +102,8 @@ get_name() {
     # Arg1 == Account ID
     # Arg2 == "bold" for bold text
     NAME=$(eval "$dbconnect -c \"SELECT id,name,created FROM account WHERE id = $1;\"" | grep -E "[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}" | awk -F '|' '{print $2}')
-    # Strip leading/trailing space from $NAME
-    NAME=${NAME#"${NAME%%[! ]*}"} NAME=${NAME%"${NAME##*[! ]}"}
+    NAME=${NAME#"${NAME%%[! ]*}"} NAME=${NAME%"${NAME##*[! ]}"}  #Strip leading/trailing space from $NAME
+
     if [ "$2" == "bold" ]; then
         echo $(tput bold)${NAME}$(tput sgr0)
     else
@@ -131,13 +131,8 @@ create_account() {
 }
 
 disable_account() {
-    #printf "\n$(tput bold)$(tput setaf 3)This action is not yet supported!\n\n$(tput sgr0)"
-
     eval "$dbconnect -c \"SELECT id,name,created FROM account WHERE enabled = true ORDER BY name;\""
     read -p "Enter Account ID: " ID
-    #NAME=$(eval "$dbconnect -c \"SELECT id,name,created FROM account WHERE id = ${ID};\"" | grep -E "[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}" | awk -F '|' '{print $2}')
-    #read -p "$(tput bold)$(tput setaf 3)DISABLING$(tput sgr0) account #${ID}:$(tput bold)${NAME}$(tput sgr0)... Are you sure? (y/N)" -n1 CONFIRM
-    #read -p "$(tput bold)$(tput setaf 3)DISABLING$(tput sgr0) account #${ID}:$(tput bold)$(get_name $ID)$(tput sgr0)... Are you sure? (y/N)" -n1 CONFIRM
     read -p "$(tput bold)$(tput setaf 3)DISABLING$(tput sgr0) account #${ID}: $(get_name $ID bold). Are you sure? (y/N)" -n1 CONFIRM
     case $CONFIRM in
         [Yy])
@@ -150,11 +145,6 @@ disable_account() {
             printf "\n$(tput bold)$(tput setaf 1)ABORT\n\n$(tput sgr0)"
             ;;
     esac
-    
-    # # Delete Account (DO NOT USE)
-    # DELETE FROM balance WHERE id = (SELECT id FROM account WHERE name = ${name});
-    # DELETE FROM transaction WHERE account = (SELECT id FROM account WHERE name = ${name});
-    # DELETE FROM account WHERE name = ${name};
     hold_menu
 }
 
@@ -174,11 +164,6 @@ enable_account() {
             printf "\n$(tput bold)$(tput setaf 1)ABORT\n\n$(tput sgr0)"
             ;;
     esac
-    
-    # # Delete Account (DO NOT USE)
-    # DELETE FROM balance WHERE id = (SELECT id FROM account WHERE name = ${name});
-    # DELETE FROM transaction WHERE account = (SELECT id FROM account WHERE name = ${name});
-    # DELETE FROM account WHERE name = ${name};
     hold_menu
 }
 
@@ -203,9 +188,6 @@ make_deposit() {
             ;;
     esac
     hold_menu
-# # Transaction (Deposit)
-# INSERT INTO transaction (account,deposit,timestamp) VALUES ((SELECT id FROM account WHERE name = ${name}),${amount},${tstamp});
-# UPDATE balance SET gold = gold + 123.45 WHERE id = (SELECT id FROM account WHERE name = ${name});
 }
 
 make_withdrawal() { 
@@ -229,20 +211,15 @@ make_withdrawal() {
             ;;
     esac
     hold_menu
-# # Transaction (Withdraw)
-# INSERT INTO transaction (account,withdrawal,timestamp) VALUES ((SELECT id FROM account WHERE name = ${name}),${amount},${tstamp});
-# UPDATE balance SET gold = gold - 12.34 WHERE id = (SELECT id FROM account WHERE name = ${name});
 }
 
 bank_transfer() {
-    # show balances first
-    eval "$dbconnect -c \"SELECT account.id,account.name,gold FROM balance INNER JOIN account ON account.id = balance.id WHERE account.enabled = true ORDER BY name;\""
+    eval "$dbconnect -c \"SELECT account.id,account.name,gold FROM balance INNER JOIN account ON account.id = balance.id WHERE account.enabled = true ORDER BY name;\"" #Show balances first
 
     read -p "Enter Account ID to transfer $(tput bold)FROM$(tput sgr0): " FROM
     read -p "Enter Account ID to transfer $(tput bold)TO$(tput sgr0): " TO
     read -p "Enter amount of gp to transfer: " amount
     tstamp=$(date +%Y-%m-%d\ %H:%M:%S)
-    #read -p "Transfer ${amount}gp from account #${FROM}:$(tput bold)$(get_name $ID)$(tput sgr0)to account #${TO}:$(tput bold)$(get_name $ID)$(tput sgr0)... Are you sure? (y/N)" -n1 CONFIRM
     read -p "Transferring ${amount}gp from $(get_name $FROM bold) to $(get_name $TO bold). Are you sure? (y/N)" -n1 CONFIRM
     case $CONFIRM in
         [Yy])