Wrap at a sane width and remove errant whitespace. Change-Id: I31fada44126d3a55b1045990c8bcd756093a508a