zsh: whitespace fix
zsh: even more local cleanup