Comment typos, minor cleanup