Code clean up in World.cs.  A lot better.  Still a lot further to go.