Parser code simplification v0.1