ZSH: Variable clean up and such