whitespace, typos, cleanup