Second pass on refactoring upload method'