Better regex.  Remove variable that we don't need.