Added line break cleanup