Parser Code Clean Up