Typos, debatable stylistic choices and minor whitespace cleanup