Minor mostly cosmetic changes