Trade Code parsing cleanup