further refactoring to make Excel imports more generic