refactoring mistakes and testing git