Oauth - User REST
Code Clean-up

Refactor and Optimized