Replaced accidentally removed upload
Code tidy