cosmetic changes

Change-Id: I53a8be38cfde116f37a9153a08d0833d1ce942e7