DRY — Tidy up permission checking