[TASK] Trade: Code clean up