Refactoring ClubManager DataRepository