format cleanup

Change-Id: I6d7e35e4150a48f7a42fe5235c543b6eb5cce893