Remove non-capturing group regex for legibility