Polish a little bit more

Change-Id: I97c4de3027b22b5b263e2f0966ca29ff876a85ba