Some cosmetic changes

Change-Id: I1b7d1edaef3e7fd48fc48cdea09706c09d04c1e6
4 files changed