Refactoring ExportView
Cleanup