improve regexes after testing in IRB