Made some minor, mostly cosmetic changes.