Adds some whitespace back, re-breaks some lines, unbreaks others