make ClickListener a bit cleaner