Cleanup
Move cardonClickListeners to be local instead of static remote