More reformatting for uniformity

Change-Id: I627beecb3a78c5b37cbc3b6d1d757feadcd2b4b3
6 files changed