Collapse to single regex
Address some comments from GH