Product Photo upload - code cleaning