PLF-4468 : improve comments