Fixed zsh path and tidied it up