Listview Delegate Refactoring