Refactoring Repo