Cleanup some cruft
Use a dict for find_winner