Refactor: push method into picker delegates to avoid more switch logic