Just cleaning a bit the regex

Unifying it around.