Minor style fixes

Change-Id: I464a19cc1f56c98c210df39cf293a10f5658eab0