improve parsing process