typo fix and clean up