Reorganize imports
ignore warning
Edited the trade title.
small refactorings