cleanup permissions
fix formatting