Regex Improvements