Cleaned up, corrected exports