Mostly cosmetic changes