addressed RFC editor comments