General code cleanup, beginning of the Upload form