More corrections to coding style
More code-style corrections added
More code-style corrections added