Remove line breaks and update mappings