Coding style cleanups

Change-Id: I221f9dd561044831f9b460a2c4b7d352a2b58b01