refactor selection and clean up
refactor selection and clean up

senseidb/sensei,javasoze/sensei,javasoze/sensei,DataDog/sensei,senseidb/sensei,javasoze/sensei,javasoze/sensei,DataDog/sensei,DataDog/sensei,DataDog/sensei,senseidb/sensei,senseidb/sensei