Cosmetic changes

Change-Id: I96175abd9b2e18df4ac1545ee68ada6645645885