some cosmetics...

Change-Id: I86ce0cb28bc05d2b4c62c84bcaca9b0bc83a4345