Refine code in C12_21_PickFactory