[CLC-2102] Style cleanup