Initial refactoring of retrievePicks service calls