Clean and consolidate export code #190

Moving more instances etc