Refactored of the Trade index file.

This should squash Issue #78 and Issue #88