Modest steps towards refactoring upload form