Refactor XSSFBuilder