Minor refactoring to SpreadsheetImporter