Improve parser
Fix read line