A bit of refactoring with respect to git