Cleaned up Trade api