There is no reason for Entry to inherit from dict
Misc readability/efficiency changes

Incorporate some things I've learned in the nine months since I authored this