simplified a regex a little