A little rearrange

Change-Id: I5668c64b4350d4803e17be6302a31e0b4a746aea