Added language code
Reordered contracting authority name if reversed
Removed unused variable