Clean and consolidate export code #190

Adds more utility export functions