Refactoring UserService