more refactor
create Pick class