- Simplify/fix logic for authorization - Rename/refactor for clarity - Add tests for auth related code