Finish cleanup of World.py