Better regex for variables