Formalize Authorization States; Whitespace Touchup