Refactored Upload#upload