Cleaned up the downloader (committing changes from July 1, 2012)