improve downloaded image file name + code cleanup