formatting cleanup

Change-Id: Ifa7ba23ec3dc66dff6719de1920fd7869774e400