Enhanced robustness of ExcelRowMapper
Do some refactoring