Refactoring in AccordionHeaderOnClickListener