Cleaning up the exporter.
Merge pull request #7 from IWSLLC/cleanup

Cleaning up the exporter.