Refactor return so that it doesn't use pick()