Cleaned up the policy structure