Style cleanups

Change-Id: I19313cc9a6fb1fe112826fd7994a47788f339534