Integrated AuthorizationActivity

Also cleaned up a few comments