cleanup and typos