Refactor aliases to work for both bash and zsh
Same theme for bash as for zsh