Parser Code Cleanup