Optimise performOnClick method