Code cleanup.  Need to debug, videos get an error trying to autostart after downloading