Reformat source

Change-Id: I5dc0e0cd9e0d0d78c7bec43033e844b39e056b72