Tiding up the upload script