improve regexps a little bit