Refactor git handling
updates