improve regex
Refactor