Coding standard cleanup

Coding standard cleanup