More coding style fixing to improve the readability. No actual semantics
changed. This also makes cpplint happy.
30 files changed