Update code formatting

Change-Id: I16a9b42651f1cfb1a70dffbb67b7b83dfeb90d03