Cleaning up Hungry Fish Code