showImages: Rework code, remove duplicated code
Merge pull request #1401 from mc10/show-images

showImages: Rework code, remove duplicated code