improve style

Change-Id: Iee3ca7c9acdfbef9b0094c3f8bf3d81a24a84001