Refined Regex
Regex improvement.