Comment & simplify image generation