More general cleaning, focused on the TradeFragment
Merge remote-tracking branch 'origin/master'