style improvements

Change-Id: I69053a72dc6741e1485a791cb0d6dcb287cc6d59
Merge "style improvements"