Refactored policy effects

Modified policy effects so they would better adhere to the open/closed
principle.