Authz pep refactor