Parser code cleanup