cosmetic fixes

Change-Id: I9fa73be472c16ed40577029a7b30169b424ba8f3