- Repository Refactor (More cleanup)