Main parse routine refinement