Clean up code
Refactor out WorldContainer