extract method
Clean up code
Refactor regexs