refactor method
add regex