refactor picker
refactor picker