Refactor internation fare parse