Minor cosmetics

Change-Id: I47c7bb80aade5d872038ffb09a39c5220873b1e7