[fix] Code style errors
Merge pull request #1475 from gunjanpatel/code_style

[fix] Code style errors