few cosmetic changes

Change-Id: I0c48a19fa0bcf2c517cf48cf76d277bb4333b29d