Move comma identification to parse text