Time based policies: code cleanup.

Jira issue: WP-1144
Merge pull request #41 from steverc/WP-1144-policyTiming2

Time based policies: code cleanup.