parentheses around regexes

this is easier for later maintenance