cleaned up world creation