Clean and consolidate export code #190

Cleaning