- Code cleanups, small typo fixes.