cleaned up uploader.py