cleaning up oauth stuff a bit