Minor code cleanup in ImgStore