mostly cosmetic changes