ExcelDemo refactored