World.cs refactored. Level of abstraction raised.