[CLC-1640] Clean up syntax