some more cosmetic changes