Refactoring OAuth.