More reformatting for uniformity

Change-Id: I37e80f687f480d887babe0214cd9919ec88a296e
7 files changed