Shorten - Small improvement to click handler