Small clean up of zshrc (it's still a mess)