Making the regexes better