some nice cosmetic changes