Better regex - support spaces