Some cosmetics.

Change-Id: I4825d94c58d8cfb245f110b7f46397c2724436a3