Coding style clean up
Revert "Coding style clean up"

This reverts commit faa656e1e87f6068c3955011e73c0978d025e705.