minor 'cosmetic' changes