Refactor excel export as i read it