fix - regular expression matching from the whole message; minor refactor
fix - regular expression matching from the whole message; minor refactor

Intelligent-Machine-Learning/Round1,general-ai-challenge/Round1,general-ai-challenge/Round1,Intelligent-Machine-Learning/Round1,Intelligent-Machine-Learning/Round1,general-ai-challenge/Round1