Refactoring + git testing