Fishing helper cleanup (#2506)* Initial update/cleanup* Naming fixes* `getRandomReward` cleanups (commit: cb612da)