Minor style changes

Change-Id: I4434b226dd6d41a37af228c67949a867c2f6487d