Cleanup little bits of code, consolidate others.
Cleanup little bits of code, consolidate others.

Completed a TODO and made code surrounding it more concise.
Fixed a few minor typos/grammar/layout things.

anchor/oauth2-server,jasonzoladz/oauth2-server