Some minor code cleanups
Some documentation updates