Minor (mostly cosmetic) changes