Whitespace, quote fixes, minor formatting cleanup