Improve code style.

Change-Id: I26e043849bce2a4b41ae132fbe0c882f4a6f112f
42 files changed