Clean-up/refactor git-aliases