work-with-data: Internal cleanup (mainly splitting wrapping lines).

work-with-data: Internal cleanup (mainly splitting wrapping lines). #965