Simplify permissions enforcement
Fix indentation