Typo fix and clean up