Coding style tweaks

Change-Id: I3236b1f023a5230d3cb7d5809627dfa13624c251