Refactor code to use OAuthToken more often instead of duplicate functionality