Refactor and refine picker