Dungeon and Pythons refactored