Parser code reformatted