[CLC-1775] Comments + quotes fixing