Final commit for project 1. Various cleanup and removed all code for progress bar (wasn't working)