refactor gofish and base for rummy