Fix up formatting more

Change-Id: I78299bbd646d4205febfb596d3e27df219d2860c