provexport: Refactoring