Cleanup egregious style issues.

No actual code logic changes, only cosmetics.

Change-Id: I81d537610394fcb119dd80ddbc3d3f0295fd5a9a
3 files changed