Refactored policy methods

Refactored code in policies for DRYness.