Cleaned up Dungeon and LevelGenerator