Tidying the regexes