encapsulated world controller, removed some dead code