parser refactorization progress