diff --git a/zsh/zshrc b/zsh/zshrc
index 605ec65..648959c 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -13,7 +13,6 @@ path=(
 
 # De-dupe path entries
 typeset -U path
-# path=($^path(N-/))
 
 # Install oh-my-zsh if it doesn't exist
 if [ ! -d "$HOME/.oh-my-zsh/" ]
@@ -24,9 +23,9 @@ fi
 export ZSH="$HOME/.oh-my-zsh"
 
 # Install the zsh-autosuggestions plugin if it doesn't exist
-if [ ! -d ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions ]
+if [ ! -d "$HOME/.oh-my-zsh/custom/plugins/zsh-autosuggestions" ]
 then
-    git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+    git clone https://github.com/zsh-users/zsh-autosuggestions "$HOME/.oh-my-zsh/custom/plugins/zsh-autosuggestions"
 fi
 
 plugins=(
@@ -80,16 +79,16 @@ include_files=(
 )
 
 for file in "${include_files[@]}"; do
-    if [ ! -f $HOME/$file ]
-    then
-        # Create files even if they aren't overriden in the environment
-        touch $HOME/$file
+    full_path="$HOME/$file"
+
+    if [ ! -f "$full_path" ]; then
+        touch "$full_path"
     fi
 
-    source $HOME/$file
+    source "$full_path"
 done
 
-source $ZSH/oh-my-zsh.sh
+source "$ZSH/oh-my-zsh.sh"
 
 # Call to zprof for startup timings
 # zprof