GitGrid class refactoring