Fishing refactoring