General style cleanup

Change-Id: Icebed73fad25697544a717ae45287a04e261ed2f