Some slightly more accurate regex