assure that both uploaded files get uploaded

fix in code
change in order , nothing serious

nothing much
change in lines order and spaces

nothing important