Cleanup
Minor TradeHandler optimization