Undid some changes to keep line-wrapping

So as to keep consistent with other versions (and abide by the 80-char margin), I undid some of the unwrapping of lines.