Better regex
Fix trim changes