minor refactor Dungeon