Small mostly cosmetic changes