Refactor pickuper