refactor: improve code for policies

Elad, do you know what Hound is complaining about here?