More refactoring of progress calculations