cosmetic changes to Nikita's patch