Readability and minor typo fixing

A scrub to improve readability and fix some minor typos.