Formatting updates

Change-Id: I95c7c751cce352b550a791204028a72dfdc2e57c