Fix a couple comment typos, and a minor cleanup