Refactor upload funds