Formatting fixes

Change-Id: Ic0af02d8e302807b4599b0085df102a3ee4b30c2