Code improvement over userservice and user