Coding standards fix

Coding standards fix's