[CLC-1569] Cleaning up sloppy logging output
Merge pull request #880 from yuhunglin/CLC-1569

[CLC-1569] Cleaning up sloppy logging output