Fix a few spelling and formatting nits

Change-Id: I03719e4221d3ecd719b98e98b7096d1300568160