Remove unused parameter
Extract method
Inline helpers
Don't need to keep refetching the policy