Optimize Policy.yaml readability