Code after refactoringgit status