[CLC-1673] Style fixes