Refactor the repo (2)