[Core] Cleaned the export feature
[Core] Code cleaning