Improve parser error messages
Improve organization