Format and cleanup

Change-Id: I080f6970e0dfa4e895788e77e7d0a264bd963e52