Refactoring to try and make the code cleaner for oauth.
Merge branch 'master' of https://github.com/S73417H/p2