Update code formatting and a few other nit picks

Change-Id: If3ff1d5021c4285acfaa1a078c3a0aed48b56e38