Progress bar refactoring