cosmetic fixes

Change-Id: Ica7dbf7141d769a2ef7c74632be5a3342b9a3561