cosmetic changes

Change-Id: Ia60ca0c24d2ae7e428e2982b57a235691549f0d6