Refactors the form upload methods slightly