diff --git a/bash_it.sh b/bash_it.sh
index 4b70235f..8eea4c6a 100755
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -7,7 +7,8 @@ then
   # Setting $BASH to maintain backwards compatibility
   # TODO: warn users that they should upgrade their .bash_profile
   export BASH_IT=$BASH
-  export BASH="$(bash -c 'echo $BASH')"
+  BASH="$(bash -c 'echo $BASH')"
+  export BASH
 fi
 
 # For backwards compatibility, look in old BASH_THEME location
@@ -15,7 +16,7 @@ if [ -z "$BASH_IT_THEME" ];
 then
   # TODO: warn users that they should upgrade their .bash_profile
   export BASH_IT_THEME="$BASH_THEME";
-  unset $BASH_THEME;
+  unset BASH_THEME;
 fi
 
 # Load composure first, so we support function metadata
@@ -30,9 +31,9 @@ LIB="${BASH_IT}/lib/*.bash"
 APPEARANCE_LIB="${BASH_IT}/lib/appearance.bash"
 for config_file in $LIB
 do
-  if [ $config_file != $APPEARANCE_LIB ]; then
+  if [ "$config_file" != "$APPEARANCE_LIB" ]; then
     # shellcheck disable=SC1090
-    source $config_file
+    source "$config_file"
   fi
 done
 
@@ -57,7 +58,7 @@ source "${BASH_IT}/themes/base.theme.bash"
 
 # appearance (themes) now, after all dependencies
 # shellcheck source=./lib/appearance.bash
-source $APPEARANCE_LIB
+source "$APPEARANCE_LIB"
 
 # Load custom aliases, completion, plugins
 for file_type in "aliases" "completion" "plugins"
@@ -75,7 +76,7 @@ for config_file in $CUSTOM
 do
   if [ -e "${config_file}" ]; then
     # shellcheck disable=SC1090
-    source $config_file
+    source "$config_file"
   fi
 done
 
diff --git a/uninstall.sh b/uninstall.sh
index 18d88e80..17712610 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -16,7 +16,7 @@ esac
 BACKUP_FILE=$CONFIG_FILE.bak
 
 if [ ! -e "$HOME/$BACKUP_FILE" ]; then
-  echo -e "\033[0;33mBackup file "$HOME/$BACKUP_FILE" not found.\033[0m" >&2
+  echo -e "\033[0;33mBackup file $HOME/$BACKUP_FILE not found.\033[0m" >&2
 
   test -w "$HOME/$CONFIG_FILE" &&
     mv "$HOME/$CONFIG_FILE" "$HOME/$CONFIG_FILE.uninstall" &&