Completed refactoring of service module retrievePicks calls