Better line breaks and generate two ways