Don't subclass Hash

And other minor style things.

Not tested...lolz