Refactor and new git