Code quality improvements for export module.