Apply Tom's feedback
Fix a typo