Update code formatting

Change-Id: Ib71e9a4d053b96b84d7366e2a5599c99a378cecd