Refactor git aliases
Refactor zshrc