make the entropy gathering simpler for certain setup, and cleanup a bit