WIP: refactoring parser
WIP: parser refactoring