Small stylistic change, plus i18n fixes.

Change-Id: Id3029e20fcadec69a3d53553d354f9271ba6e130