Refactoring user service