Formatting fixes

Change-Id: I75173f09527f84419d1b807e9e33ff673e0f5d1c