Fix a typo and do some cosmetic changes.