Some refactoring in order to improve my gitdiff.