Add some refactoring in ExcelParser