VID-1527 better commenting