Refactored xls reports