Minor Changes to Regex