fix regex
refactor
refactor