More reformatting for uniformity

Change-Id: I054c705f92748d1784864aa6956ac069f9e0eb29
6 files changed