Made accessTokenProvider optional.

Plus style fixes.
Style fixes.
Merge remote-tracking branch 'origin/master'