CLC-1179 Code format change