Formatting cleanup

Change-Id: I3dc197decd764be406e7d3f12e02351e818739ff