Further simplified and tidied up the ZSH prompt.