Changed regex to non capturing groups