Refactored Oauth-Clients code