Revert "Use dict.get() consistently and clean up minor spacing issues."

This reverts commit 1446d7be7743246462f53cb4b34519cbecb28c89.
Merge pull request #84 from scottpurdy/master

Revert 1446d7