Cleaned up somewhat the appearance of Trade