Refactor picking