Sonar cleanup for PolicyEngineUtils