rege refactoring
Regex refactoring