Grammar and other cosmetic changes