Reformatted some code

Change-Id: I442be213f3deb2db80f99adce3c8d184b96d6b80