Typo/wording fixes and code cleanups.