Small style fixes.

Change-Id: I0d33a2f9c8939924d423a4186bc5889328efbda6