More reformatting for uniformity

Change-Id: I14e9f96304085332520f3939399030f9e0ce271f
6 files changed