Refactors some things in the CustomerRepo
Fix merge conflict