BAC-602: comments fixes