Code cleanup and downloader class added