typos, cleanup