Light modifications on the regex