mwf: begin parser refactoring
mwf: minor parser improvements
Merge pull request #3 from delta-nry/refactoring

Refactoring