Minor clean up and prototyping for upload progress bar