Refactoring User-Repository