ENH: remove non-capturing groups for readibility