a bit of minor cleanup.
significantly improved the default policy.