Refactor Trade Controller

[#49688575]