light parser refactoring in progress