Cleanup and typos.