Edit code
Refactor regex