refactoring
refactoring
refactoring
report state of the parsing
Improve API
Small optimization