diff --git a/bash_profile b/bash_profile
index 6bb43fa..534c4e1 100644
--- a/bash_profile
+++ b/bash_profile
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-if [ -f $HOME/.bash/profile ]; then source $HOME/.bash/profile; fi
-if [ -d $HOME/.bash/profile ]; then for file in $(ls $HOME/.bash/profile/*); do source $file; done; fi
-if [ -d $HOME/.bash/profile.d ]; then for file in $(ls $HOME/.bash/profile.d/*); do source $file; done; fi
+if [ -f "$HOME"/.bash/profile ]; then source "$HOME"/.bash/profile; fi
+if [ -d "$HOME"/.bash/profile ]; then for file in "$HOME"/.bash/profile/*; do source "$file"; done; fi
+if [ -d "$HOME"/.bash/profile.d ]; then for file in "$HOME"/.bash/profile.d/*; do source "$file"; done; fi
 
 # This file is sourced by bash for login shells.  The following line
 # runs your .bashrc and is recommended by the bash info pages.
diff --git a/bashrc b/bashrc
index ba90a24..efe28fe 100644
--- a/bashrc
+++ b/bashrc
@@ -6,28 +6,27 @@
 # Test for an interactive shell.  There is no need to set anything
 # past this point for scp and rcp, and it's important to refrain from
 # outputting anything in those cases.
-if [[ $- != *i* ]] ; then
+if [[ $- != *i* ]]; then
 	# Shell is non-interactive.  Be done now!
 	return
 fi
 
 # Source custom libs
-if [ -d $HOME/.bash/libs ]; then for lib in $(ls $HOME/.bash/libs/*.bash); do source $lib; done; fi
+if [ -d "$HOME"/.bash/libs ]; then for lib in "$HOME"/.bash/libs/*.bash; do source "$lib"; done; fi
 
 # Source rc.d/*
-if [ -d $HOME/.bash/rc.d ]; then for file in $(ls $HOME/.bash/rc.d/*); do source $file; done; fi
+if [ -d "$HOME"/.bash/rc.d ]; then for file in "$HOME"/.bash/rc.d/*; do source "$file"; done; fi
 
 # Source alias definitions
-if [ -f $HOME/.bash_aliases ]; then source $HOME/.bash_aliases; fi
-if [ -f $HOME/.bash/aliases ]; then source $HOME/.bash/aliases; fi
-if [ -d $HOME/.bash/aliases ]; then for file in $(ls $HOME/.bash/aliases/*); do source $file; done; fi
-if [ -d $HOME/.bash/aliases.d ]; then for file in $(ls $HOME/.bash/aliases.d/*); do source $file; done; fi
+if [ -f "$HOME"/.bash_aliases ]; then source "$HOME"/.bash_aliases; fi
+if [ -f "$HOME"/.bash/aliases ]; then source "$HOME"/.bash/aliases; fi
+if [ -d "$HOME"/.bash/aliases ]; then for file in "$HOME"/.bash/aliases/*; do source "$file"; done; fi
+if [ -d "$HOME"/.bash/aliases.d ]; then for file in "$HOME"/.bash/aliases.d/*; do source "$file"; done; fi
 
 # Source bash completion definitions
-for file in /etc/bash*completion /etc/profile.d/bash*completion* ; do source $file ; done
-
-if [ -f $HOME/.bash_completion ]; then source $HOME/.bash_completion; fi
-if [ -f $HOME/.bash/completion ]; then source $HOME/.bash/completion; fi
-if [ -d $HOME/.bash/completion ]; then for file in $(ls $HOME/.bash/completion/*); do source $file; done; fi
-if [ -d $HOME/.bash/completion.d ]; then for file in $(ls $HOME/.bash/completion.d/*); do source $file; done; fi
+for file in /etc/bash*completion /etc/profile.d/bash*completion*; do source "$file"; done
 
+if [ -f "$HOME"/.bash_completion ]; then source "$HOME"/.bash_completion; fi
+if [ -f "$HOME"/.bash/completion ]; then source "$HOME"/.bash/completion; fi
+if [ -d "$HOME"/.bash/completion ]; then for file in "$HOME"/.bash/completion/*; do source "$file"; done; fi
+if [ -d "$HOME"/.bash/completion.d ]; then for file in "$HOME"/.bash/completion.d/*; do source "$file"; done; fi