Refactor  itemSelectedListener