Formatting updates.
Clean up AuthScope.
Clean up.
Clean up.
Clean up.
Cleanup.
Divided into impl file.