Updated progress indicator
Small refactoring