Tidy code & stderr

Ensure image data reused if image included multiple times