Click Listener Refactor