Refactor gofish