Cleaned up export process