some code clean up and one more progress bar