Style fixes

Change-Id: I56e950a48ff12b1f017e5e235fd29d3c01046ac5