Cleanup and typos