diff --git a/modules/prompt/functions/short_pwd b/modules/prompt/functions/short_pwd
index 37950cc..d110933 100644
--- a/modules/prompt/functions/short_pwd
+++ b/modules/prompt/functions/short_pwd
@@ -1,13 +1,10 @@
 # shortens the pwd for use in prompt
 
-local current_dir="${1:-${PWD}}"
-local return_dir='~'
-
-current_dir="${current_dir/#${HOME}/~}"
+local current_dir="${${1:-${PWD}}/#${HOME}/~}"
 
 # if we aren't in ~
 if [[ ${current_dir} != '~' ]]; then
-  return_dir="${${${${(@j:/:M)${(@s:/:)current_dir}##.#?}:h}%/}//\%/%%}/${${current_dir:t}//\%/%%}"
+  current_dir="${${${${(@j:/:M)${(@s:/:)current_dir}##.#?}:h}%/}//\%/%%}/${${current_dir:t}//\%/%%}"
 fi
 
-print ${return_dir}
+print ${current_dir}