Some cleanup, mostly linebreaks