LUN-1450 : Minor comment refactor