[CLC-2102] Style cleanup
Merge pull request #1250 from yuhunglin/CLC-2102

[CLC-2102] Style cleanup