pick list refactor