refactoring data export to work w/ spacewalk