Refactor git store