Reformat to less columns

Change-Id: I44a697081d40db8013afedd0943635177c6348f5