remove comments, correct typos