CFY-529 fix comments