Added full name and removed trade legacy id
Removed trailing spaces