mostly cosmetic reformatting - no changed functionality