Refactoring some GitWrap internals