Code cleanups
Tweak README