Suggest Refactoring

I've submitted my PR for the user service. Could you take a look and let me know your thoughts?