Update formatting

With some manual corrections.

Change-Id: Icd947288c32fdb90a0f35388963ef5a17ffa58e7