cleanup and typo fix