cosmetic changes to match more closely the literature