Remove outdated comment
Unwrap a few very short, wrapped lines
Wrap a few very long lines