Added some comments and cleaned things up.
Simplified policy code base.