refactor fishing event