cleaned up uploader