A few refactors to Excel, fixed MAGN-517