Cleanup of world_cup.py (not done yet). More tweaks
Tweaks