Gallery: reuse $currentTarget
Simplify