refactoring some zsh stuff