cleanup and typo correction