Code cleanup. List selection for multiple items