Adjust code formatting

Change-Id: I540c7e0167db593eeba062b7f20860daca426ddc