Changes based upon on code review.
Improve formatting in the COLLECTION_POLICY.
Merge pull request #1 from adam-vessey/7.x-code-review

Improve formatting in the COLLECTION_POLICY.
Merge pull request #3 from jordandukart/7.x-code-review

Changes based upon on code review.