zsh: need some more style improvements