formating improvements

Change-Id: If6478423899bc77906cd4c1bb6ed2f99964e77c5