ENYO-2449: removed comment, reformat/clarify other comments