Simplify the regex for extract