Better management of line breaks