Minor update: clean class TargetImage